From: bruneton Date: Wed, 10 Jul 2013 08:50:23 +0000 (+0000) Subject: CMake: added FindSalomeMED.cmake so taht PARAVIS can load MED in config mode X-Git-Tag: V7_3_1b1~339 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=380faf9e1a3a08bd5b9817cdf55d2199135d404a;p=tools%2Fmedcoupling.git CMake: added FindSalomeMED.cmake so taht PARAVIS can load MED in config mode Fixed some configruation elements --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ead1e4d1..3ff90e5f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -270,8 +270,9 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} # Create the configuration files: # - in the build tree: -# Ensure the variables are always defined for the configure: - +# Ensure the variables are always defined for the configure (even if empty): +SET(KERNEL_ROOT_DIR "${KERNEL_ROOT_DIR}") +SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}") SET(MEDFILE_ROOT_DIR "${MEDFILE_ROOT_DIR}") SET(HDF5_ROOT_DIR "${HDF5_ROOT_DIR}") SET(MPI_ROOT_DIR "${MPI_ROOT_DIR}") @@ -292,7 +293,8 @@ CONFIGURE_PACKAGE_CONFIG_FILE(adm_local/cmake_files/${PROJECT_NAME}Config.cmake. ${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE}" PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE CMAKE_INSTALL_PREFIX - MEDFILE_ROOT_DIR HDF5_ROOT_DIR OMNIORB_ROOT_DIR PTHREAD_ROOT_DIR + KERNEL_ROOT_DIR GUI_ROOT_DIR MEDFILE_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) diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt index 1a69921e0..dff494ff0 100644 --- a/adm_local/cmake_files/CMakeLists.txt +++ b/adm_local/cmake_files/CMakeLists.txt @@ -25,6 +25,7 @@ SET(admlocal_cmake_DATA FindSalomeParMetis.cmake FindScotch.cmake FindSalomeScotch.cmake + FindSalomeMED.cmake ) INSTALL(FILES ${admlocal_cmake_DATA} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL})