minor: deleting debug message

[modules/paravis.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 515ad3b603dadd08ae1698f817455f524ad93373..b7a488a4bbacb7c62619afd844802f6c3f55bc4e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ SET(MODULE PARAVIS)
 SET(CMAKE_MODULE_PATH 
     "${KERNEL_ROOT_DIR}/salome_adm/cmake_files" 
     "${GUI_ROOT_DIR}/adm_local/cmake_files"
-    "${CMAKE_SOURCE_DIR}/adm_local/cmake_files")
+    "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
 
 INCLUDE(SalomeMacros)
 INCLUDE(SalomeSetupPlatform)
@@ -46,6 +46,7 @@ FIND_PACKAGE(SalomeKERNEL REQUIRED)
 # From KERNEL:
 FIND_PACKAGE(SalomePython REQUIRED)
 FIND_PACKAGE(SalomeOmniORB REQUIRED)
+FIND_PACKAGE(SalomeOmniORBPy REQUIRED)
 SET(OMNIORB_IDL_PYTHON ${OMNIORB_IDL_COMPILER}) 
 FIND_PACKAGE(SalomePThread REQUIRED)
 FIND_PACKAGE(SalomeHDF5 REQUIRED)
@@ -57,9 +58,12 @@ 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)
 
 # From GUI:
@@ -76,8 +80,8 @@ message("QT_INCLUDES ${QT_INCLUDES}")
 FIND_PACKAGE(SalomeOpenGL REQUIRED)
 FIND_PACKAGE(SalomeVTK REQUIRED)
 FIND_PACKAGE(SalomeQwt REQUIRED)
-FIND_PACKAGE(SalomePyQt4 REQUIRED)
 FIND_PACKAGE(SalomeSIP REQUIRED)
+FIND_PACKAGE(SalomePyQt4 REQUIRED)
 
 SET(VERSION_MAJOR 7)
 SET(VERSION_MINOR 2)
@@ -94,13 +98,18 @@ 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 (??) ...")
 LIST(GET PARAVIEW_INCLUDE_DIRS 0 PARAVIEW_INCLUDE_DIR0)
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/getwrapclasses.py ${PARAVIEW_INCLUDE_DIR0})
+EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${PROJECT_SOURCE_DIR}/getwrapclasses.py ${PARAVIEW_INCLUDE_DIR0}
+    RESULT_VARIABLE _res)
+IF(NOT _res EQUAL 0)
+  MESSAGE(FATAL_ERROR "Unable to run the Python script retrieving the list of VTK classes.")
+ENDIF()
 
 SET(SUBDIRS
   idl