From: rnc Date: Mon, 14 Oct 2013 09:14:04 +0000 (+0000) Subject: IMP: SMESH / CMake build procedure: Added the export of MEDFILE_ROOT_DIR to the confi... X-Git-Tag: V7_3_0a1~126 X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=3c2705b25c2e026bd033aa2c2843eecfc36ceb80 IMP: SMESH / CMake build procedure: Added the export of MEDFILE_ROOT_DIR to the configuration file so that other modules can find MEDFILE based on the information provided by SMESH. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 43a11d331..e13f8c51f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -260,6 +260,7 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} # Ensure the variables are always defined for the configure: SET(GEOM_ROOT_DIR "${GEOM_ROOT_DIR}") +SET(MEDFILE_ROOT_DIR "${MEDFILE_ROOT_DIR}") SET(CGNS_ROOT_DIR "${CGNS_ROOT_DIR}") SET(TBB_ROOT_DIR "${TBB_ROOT_DIR}") @@ -268,7 +269,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX - GEOM_ROOT_DIR CGNS_ROOT_DIR TBB_ROOT_DIR) + GEOM_ROOT_DIR MEDFILE_ROOT_DIR CGNS_ROOT_DIR TBB_ROOT_DIR) WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${${PROJECT_NAME_UC}_VERSION} diff --git a/SalomeSMESHConfig.cmake.in b/SalomeSMESHConfig.cmake.in index d1f479dea..0212e3d84 100644 --- a/SalomeSMESHConfig.cmake.in +++ b/SalomeSMESHConfig.cmake.in @@ -56,6 +56,7 @@ SET(SALOME_SMESH_USE_TBB @SALOME_SMESH_USE_TBB@) # Level 1 prerequisites: SET_AND_CHECK(GEOM_ROOT_DIR_EXP "@PACKAGE_GEOM_ROOT_DIR@") +SET_AND_CHECK(MEDFILE_ROOT_DIR_EXP "@PACKAGE_MEDFILE_ROOT_DIR@") # Optional level 1 prerequisites: IF(SALOME_SMESH_USE_CGNS) @@ -135,4 +136,4 @@ SET(SMESH_StdMeshersGUI StdMeshersGUI) SET(SMESH_MeshJobManagerEngine MeshJobManagerEngine) SET(SMESH_SPADDERPluginTesterEngine SPADDERPluginTesterEngine) SET(SMESH_SalomeIDLSMESH SalomeIDLSMESH) -SET(SMESH_SalomeIDLSPADDER SalomeIDLSPADDER) \ No newline at end of file +SET(SMESH_SalomeIDLSPADDER SalomeIDLSPADDER)