For the moment MAXIMUM_NUMBER_OF_PIECES can't be removed

[modules/paravis.git] / src / Plugins / ParaMEDCorba / CMakeLists.txt

diff --git a/src/Plugins/ParaMEDCorba/CMakeLists.txt b/src/Plugins/ParaMEDCorba/CMakeLists.txt
index 200b2b32a51fbf641679e9a49ce939a99eb5ab9b..dee1d1642bbc8af6c7f29536c09ada56dd6f9716 100644 (file)
--- a/src/Plugins/ParaMEDCorba/CMakeLists.txt
+++ b/src/Plugins/ParaMEDCorba/CMakeLists.txt
@@ -34,7 +34,7 @@ PROJECT( ParaMEDCorba )
     
     INCLUDE( ${PARAVIEW_USE_FILE} )
 
-    FIND_PACKAGE( VTK 6.1 COMPONENTS vtkClientServer NO_MODULE)
+    FIND_PACKAGE( VTK COMPONENTS vtkClientServer NO_MODULE)
     INCLUDE( ${VTK_USE_FILE} )
 
     SET( PARACORBAPLUG_SRCS
@@ -51,8 +51,7 @@ PROJECT( ParaMEDCorba )
       SERVER_MANAGER_SOURCES ${PARACORBAPLUG_SRCS} )
     
     INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR} ${MED_ROOT_DIR}/include/salome ${KERNEL_ROOT_DIR}/include/salome)
-    SET_TARGET_PROPERTIES(ParaMEDMEM2VTK PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}")
-    SET_TARGET_PROPERTIES(ParaMEDCorbaPlugin PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}")
+    ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
 
     TARGET_LINK_LIBRARIES(ParaMEDMEM2VTK
       #vtkCommon
@@ -69,6 +68,17 @@ PROJECT( ParaMEDCorba )
       ParaMEDMEM2VTK
       )
     
+    #Build library with a static runtime and ignore MSVCRT.lib on WINDOWS
+    IF(WIN32)
+      IF(CMAKE_BUILD_TYPE STREQUAL Debug)
+        SET_TARGET_PROPERTIES(ParaMEDMEM2VTK PROPERTIES LINK_FLAGS "/NODEFAULTLIB:MSVCRTD")
+        SET_TARGET_PROPERTIES(ParaMEDMEM2VTK PROPERTIES COMPILE_FLAGS "/MTd")
+      ELSE()
+        SET_TARGET_PROPERTIES(ParaMEDMEM2VTK PROPERTIES LINK_FLAGS "/NODEFAULTLIB:MSVCRT")
+        SET_TARGET_PROPERTIES(ParaMEDMEM2VTK PROPERTIES COMPILE_FLAGS "/MT")
+      ENDIF()
+    ENDIF(WIN32)
+
     INSTALL(TARGETS ParaMEDCorbaPlugin DESTINATION lib/paraview)
 
     INSTALL(TARGETS ParaMEDMEM2VTK DESTINATION lib/salome)