CMake: adapted detection and some target names to fit recent changes in MED

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 570b15cad1e2e356b09b960c3a0680aa3196ebed..068f63886bb09fab95d375bef5b03afd07c7021b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,10 +58,16 @@ FIND_PACKAGE(SalomeDoxygen REQUIRED)
 
 # Specific to ParaVis:
 FIND_PACKAGE(SalomeParaView)
+IF(TARGET vtkTools)
+ message("bli !!")
+endif()
 
 # GUI has to be loaded AFTER ParaView: the ParaView config doesn't mix
-# well with the VTK one (GUI loads VTK):
+# well with the VTK one (and GUI loads VTK):
 FIND_PACKAGE(SalomeGUI REQUIRED)
+IF(TARGET vtkTools)
+ message("bli !!")
+endif()
 
 # From GUI:
 FIND_PACKAGE(SalomeCAS REQUIRED)
@@ -95,8 +101,9 @@ SET(BUILD_PLUGINS 1)
   #SET(WITH_VISU 1)
 #ENDIF(EXISTS ${VISU_ROOT_DIR}/adm_local/cmake_files/FindVISU.cmake)
 
-SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR} CACHE PATH "MED_ROOT_DIR")
-INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindMED.cmake)
+SET(MED_ROOT_DIR "$ENV{MED_ROOT_DIR}" CACHE PATH "Path to the MED Salome module")
+LIST(APPEND CMAKE_MODULE_PATH "${MED_ROOT_DIR}/adm_local/cmake_files")
+FIND_PACKAGE(SalomeMED REQUIRED)
 
 # TODO: the below requires ParaView in the PYTHONPATH ... not so nice:
 MESSAGE(STATUS "Generating wrapped class list (??) ...")

diff --git a/src/ENGINE/CMakeLists.txt b/src/ENGINE/CMakeLists.txt
index 7bb220cdee2d84457c0d800413fb7f0c1cad665c..053a3a1662ce9d91eeabab3beae87ecaddd6090a 100644 (file)
--- a/src/ENGINE/CMakeLists.txt
+++ b/src/ENGINE/CMakeLists.txt
@@ -33,7 +33,9 @@ ENDFOREACH(f ${var})
 SET_TARGET_PROPERTIES(PARAVISEngine PROPERTIES COMPILE_FLAGS "${flags}")
 SET_TARGET_PROPERTIES(PARAVISEngine PROPERTIES VERSION ${VERSION_INFO} SOVERSION ${SOVERSION_INFO})
 
-TARGET_LINK_LIBRARIES(PARAVISEngine ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${KERNEL_LDFLAGS} ${SalomeIDLKernel} ${SalomeNS} ${SalomeContainer} ${SALOMELocalTrace} ${OMNIORB_LIBRARIES} SalomeIDLPARAVIS)
+TARGET_LINK_LIBRARIES(PARAVISEngine ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${KERNEL_LDFLAGS} 
+  ${KERNEL_SalomeIDLKernel} ${KERNEL_SalomeNS} ${KERNEL_SalomeContainer} ${KERNEL_SALOMELocalTrace} 
+  ${OMNIORB_LIBRARIES} SalomeIDLPARAVIS)
 INSTALL(TARGETS PARAVISEngine DESTINATION lib/salome)
   
 INSTALL(FILES PARAVIS_Engine_i.hh DESTINATION include/salome)

diff --git a/src/PVGUI/CMakeLists.txt b/src/PVGUI/CMakeLists.txt
index 34881a102d5b9bd162249903671b008915a61042..038c09f0473a768c5f794968c54c35c376675e9e 100644 (file)
--- a/src/PVGUI/CMakeLists.txt
+++ b/src/PVGUI/CMakeLists.txt
@@ -186,9 +186,11 @@ TARGET_LINK_LIBRARIES(PARAVIS
   ${CAS_KERNEL}
   ${VTK_LIBS}
   ${PYTHON_LIBS}
-  ${KERNEL_LDFLAGS} ${SalomeDS} ${SALOMELocalTrace} ${SalomeIDLKernel} ${SalomeNS} ${SalomeLifeCycleCORBA} ${SalomeContainer} ${TOOLSDS}
-  ${GUI_LDFLAGS} ${SalomeApp} ${LightApp} ${CAM} ${qtx} ${suit} ${Event} ${PyInterp} ${SalomeObject} ${vtkTools}
-  ${MED_LDFLAGS} ${SalomeIDLMED}
+  ${KERNEL_LDFLAGS} ${KERNEL_SalomeDS} ${KERNEL_SALOMELocalTrace} ${KERNEL_SalomeIDLKernel} 
+                    ${KERNEL_SalomeNS} ${KERNEL_SalomeLifeCycleCORBA} ${KERNEL_SalomeContainer} ${KERNEL_TOOLSDS}
+  ${GUI_LDFLAGS} ${GUI_SalomeApp} ${GUI_LightApp} ${GUI_CAM} ${GUI_qtx} ${GUI_suit} ${GUI_Event} ${GUI_PyInterp} 
+                 ${GUI_SalomeObject} ${GUI_vtkTools}
+  ${MED_LDFLAGS} ${MED_SalomeIDLMED}
   ${VISU_LDFLAGS}
   ${VISU_PARAVIS_LIBS}
   ${PARAVIEW_LIBS}

diff --git a/src/Plugins/ParaMEDCorba/CMakeLists.txt b/src/Plugins/ParaMEDCorba/CMakeLists.txt
index 45329968d2e9e6de66e21a42ac6644a93e3b1b02..7ab3d5d8b19ddbfe46429c2aebb315b1d7369070 100644 (file)
--- a/src/Plugins/ParaMEDCorba/CMakeLists.txt
+++ b/src/Plugins/ParaMEDCorba/CMakeLists.txt
@@ -61,8 +61,8 @@ PROJECT( ParaMEDCorba )
       vtkClientServer
       pqCore
       ${OMNIORB_LIBRARIES}
-      ${SalomeIDLMED}
-      ${SalomeIDLKernel}
+      ${MED_SalomeIDLMED}
+      ${KERNEL_SalomeIDLKernel}
       ${QT_LIBS}
       )
     TARGET_LINK_LIBRARIES(ParaMEDCorbaPlugin