Adapting to latest CMake modifications in

[modules/med.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf368271aca854098f5a2398707b3804798414db..d132ed960dc9a54845dfc2d161fe10124664cc4c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,22 +72,19 @@ OPTION(SALOME_BUILD_GUI "Build GUI of MED." ON)
 OPTION(SALOME_BUILD_TESTS "Build MED tests." ON)
 OPTION(SALOME_BUILD_DOC "Build MED doc." ON)
 
+# Find MEDCoupling (required)
+# ==========================
+SET(MEDCOUPLING_ROOT_DIR $ENV{MEDCOUPLING_ROOT_DIR} CACHE PATH "Path to the MEDCoupling tool")
+IF(EXISTS ${MEDCOUPLING_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${MEDCOUPLING_ROOT_DIR}/cmake_files")
+  FIND_PACKAGE(SalomeMEDCoupling REQUIRED)
+ELSE(EXISTS ${MEDCOUPLING_ROOT_DIR})
+  MESSAGE(FATAL_ERROR "We absolutely need the MEDCoupling tool, please define MEDCOUPLING_ROOT_DIR !")
+ENDIF(EXISTS ${MEDCOUPLING_ROOT_DIR})
+
 #
 # Set list of prerequisites
 # =========================
-
-SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")
-IF(EXISTS ${KERNEL_ROOT_DIR})
-  LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
-  INCLUDE(SalomeMacros)
-  FIND_PACKAGE(SalomeKERNEL REQUIRED)
-  KERNEL_WITH_CORBA() #check whether KERNEL builded with CORBA
-ELSE(EXISTS ${KERNEL_ROOT_DIR})
-  MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR !")
-ENDIF(EXISTS ${KERNEL_ROOT_DIR})
-LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
-LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
-
 FIND_PACKAGE(SalomeHDF5 REQUIRED)
 FIND_PACKAGE(SalomeMEDFile REQUIRED)
 # XDR stuff
@@ -111,14 +108,10 @@ IF(SALOME_BUILD_GUI)
       MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR or turn option SALOME_BUILD_GUI to OFF !")
     ENDIF(EXISTS ${GUI_ROOT_DIR})
     FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-    FIND_PACKAGE(SalomeCAS REQUIRED) # maybe one day it will disappear ...
 ENDIF(SALOME_BUILD_GUI)
 
-LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
-
-ENABLE_TESTING() # let it outsite because even if SALOME_BUILD_TESTS is OFF, python tests that not need additional compilation can be run.
-
 IF(SALOME_BUILD_TESTS)
+  ENABLE_TESTING()
   FIND_PACKAGE(SalomeCppUnit)
   SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)
 ENDIF(SALOME_BUILD_TESTS)
@@ -153,8 +146,6 @@ IF(SALOME_BUILD_DOC)
   SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
 ENDIF(SALOME_BUILD_DOC)
 
-FIND_PACKAGE(MEDCoupling)
-
 # Detection report
 SALOME_PACKAGE_REPORT_AND_CHECK()
 
@@ -241,8 +232,8 @@ IF(SALOME_USE_MPI)
   LIST(APPEND _${PROJECT_NAME}_exposed_targets paramedcouplingcorba paramedmemcompo)
 ENDIF()
 
-LIST(APPEND _${PROJECT_NAME}_exposed_targets medcouplingcorba medcouplingclient)
-LIST(APPEND _${PROJECT_NAME}_exposed_targets medcalculator MEDFactoryEngine)
+LIST(APPEND _${PROJECT_NAME}_exposed_targets 
+    medcouplingcorba medcouplingclient medcalculator MEDFactoryEngine)
 IF(SALOME_MED_ENABLE_PYTHON)
   LIST(APPEND _${PROJECT_NAME}_exposed_targets medcalculatorspython)
 ENDIF()
@@ -263,11 +254,11 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 SET(KERNEL_ROOT_DIR "${KERNEL_ROOT_DIR}")
 SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
 SET(MEDFILE_ROOT_DIR "${MEDFILE_ROOT_DIR}")
+SET(MEDCOUPLING_ROOT_DIR "${MEDCOUPLING_ROOT_DIR}")
 SET(MPI_ROOT_DIR "${MPI_ROOT_DIR}")
 SET(HDF5_ROOT_DIR "${HDF5_ROOT_DIR}")
 SET(OMNIORB_ROOT_DIR "${OMNIORB_ROOT_DIR}")
 SET(PTHREAD_ROOT_DIR "${PTHREAD_ROOT_DIR}")
-SET(BOOST_ROOT_DIR "${BOOST_ROOT_DIR}")
 SET(SWIG_ROOT_DIR "${SWIG_ROOT_DIR}")
 SET(PYTHON_ROOT_DIR "${PYTHON_ROOT_DIR}")
 SET(CPPUNIT_ROOT_DIR "${CPPUNIT_ROOT_DIR}")
@@ -275,28 +266,23 @@ SET(GRAPHVIZ_ROOT_DIR "${GRAPHVIZ_ROOT_DIR}")
 SET(DOXYGEN_ROOT_DIR "${DOXYGEN_ROOT_DIR}")
 SET(SPHINX_ROOT_DIR "${SPHINX_ROOT_DIR}")
 
-SET(METIS_ROOT_DIR "${METIS_ROOT_DIR}")
-SET(PARMETIS_ROOT_DIR "${PARMETIS_ROOT_DIR}")
-SET(SCOTCH_ROOT_DIR "${SCOTCH_ROOT_DIR}")
-SET(XDR_ROOT_DIR "${XDR_ROOT_DIR}")
-
 #   - in the install tree:
 #       Get the relative path of the include directory so
 #       we can register it in the generated configuration files:
 SET(CONF_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}")
 
 # Build variables that will be expanded when configuring Salome<MODULE>Config.cmake:
-SALOME_CONFIGURE_PREPARE(Metis ParMetis Scotch XDR CAS Qt4 CppUnit Graphviz Doxygen Sphinx MPI omniORB
-                         PThread Boost libXml2 Python HDF5 MEDFile)
+SALOME_CONFIGURE_PREPARE(MEDCoupling XDR Qt4 CppUnit Graphviz Doxygen Sphinx MPI omniORB
+                         PThread Python HDF5 MEDFile)
 
 CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
     ${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake
     INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE}_LOCAL"
     PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX
-       KERNEL_ROOT_DIR GUI_ROOT_DIR MEDFILE_ROOT_DIR MPI_ROOT_DIR
-       HDF5_ROOT_DIR OMNIORB_ROOT_DIR PTHREAD_ROOT_DIR BOOST_ROOT_DIR
+       KERNEL_ROOT_DIR GUI_ROOT_DIR MEDFILE_ROOT_DIR MEDCOUPLING_ROOT_DIR MPI_ROOT_DIR
+       HDF5_ROOT_DIR OMNIORB_ROOT_DIR PTHREAD_ROOT_DIR 
        SWIG_ROOT_DIR PYTHON_ROOT_DIR CPPUNIT_ROOT_DIR GRAPHVIZ_ROOT_DIR DOXYGEN_ROOT_DIR
-       SPHINX_ROOT_DIR METIS_ROOT_DIR PARMETIS_ROOT_DIR SCOTCH_ROOT_DIR XDR_ROOT_DIR)
+       SPHINX_ROOT_DIR)
 
 WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
     VERSION ${${PROJECT_NAME_UC}_VERSION}