X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPlugins%2FParaMEDCorba%2FCMakeLists.txt;h=b58baba56a71ad8a3665de8a4d7eb8c63c446943;hb=7cbbd61df3f61d6f3f766b890af5352960bbaa1e;hp=8cee058bf18d29fe73b5a7c2e1c7cf3e24e0a0c8;hpb=4b015556d5938cc157ae97bdc018d08367c0729a;p=modules%2Fparavis.git

diff --git a/src/Plugins/ParaMEDCorba/CMakeLists.txt b/src/Plugins/ParaMEDCorba/CMakeLists.txt
old mode 100644
new mode 100755
index 8cee058b..b58baba5
--- 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.0 COMPONENTS vtkClientServer NO_MODULE)
+    FIND_PACKAGE( VTK 6.1 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)