Merge from BR_PORTING_VTK6 01/03/2013

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

diff --git a/src/Plugins/ParaMEDCorba/CMakeLists.txt b/src/Plugins/ParaMEDCorba/CMakeLists.txt
index 06cce60cc8ad2de5d87ec97bc9a98f8baafb7f18..50333c3dc3f5abfb55ba6011a080668fc105411a 100644 (file)
--- a/src/Plugins/ParaMEDCorba/CMakeLists.txt
+++ b/src/Plugins/ParaMEDCorba/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 PROJECT( ParaMEDCorba )
 
-  CMAKE_MINIMUM_REQUIRED( VERSION 2.6 )
+  CMAKE_MINIMUM_REQUIRED( VERSION 2.8.7 )
   ## !!! This definition corrupts wrapping process
   #SET( LIBRARY_OUTPUT_PATH ${ParaMEDCorba_BINARY_DIR}/bin CACHE INTERNAL "Single place for output" )
   #SET( EXECUTABLE_OUTPUT_PATH ${ParaMEDCorba_BINARY_DIR}/bin  CACHE INTERNAL "Single place for output" )
@@ -28,12 +28,15 @@ PROJECT( ParaMEDCorba )
     EXECUTABLE_OUTPUT_PATH
   )
 
-  FIND_PACKAGE( ParaView REQUIRED )
+  FIND_PACKAGE( ParaView COMPONENTS pqCore NO_MODULE)
 
   IF( ParaView_FOUND )
     
     INCLUDE( ${PARAVIEW_USE_FILE} )
 
+    FIND_PACKAGE( VTK 6.0 COMPONENTS vtkClientServer NO_MODULE)
+    INCLUDE( ${VTK_USE_FILE} )
+
     SET( PARACORBAPLUG_SRCS
       ${ParaMEDCorba_SOURCE_DIR}/vtkParaMEDCorbaSource.cxx
       )
@@ -47,14 +50,14 @@ PROJECT( ParaMEDCorba )
       ParaMEDCorbaUserInterfaceSources.xml
       SERVER_MANAGER_SOURCES ${PARACORBAPLUG_SRCS} )
     
-    INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIR} ${MED_ROOT_DIR}/include/salome ${KERNEL_ROOT_DIR}/include/salome)
+    INCLUDE_DIRECTORIES(${OMNIORB_INCLUDE_DIRS} ${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}")
 
     TARGET_LINK_LIBRARIES(ParaMEDMEM2VTK
-      vtkCommon
-      vtkFiltering
-      vtkGraphics
+      #vtkCommon
+      #vtkFiltering
+      #vtkGraphics
       vtkClientServer
       pqCore
       ${OMNIORB_LIBRARIES}