From: ageay Date: Fri, 4 Oct 2013 08:04:59 +0000 (+0000) Subject: Update of the bible ! (After Adrien'OK) Config file template will be moved to the... X-Git-Tag: V7_3_0a1~112 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fcb80d2438ead48c6c275b744cb21fbb621be474;p=modules%2Fmed.git Update of the bible ! (After Adrien'OK) Config file template will be moved to the top dir. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7630659dd..22d07e77c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -316,7 +316,7 @@ SET(SPHINX_ROOT_DIR "${SPHINX_ROOT_DIR}") # 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}") -CONFIGURE_PACKAGE_CONFIG_FILE(adm_local/cmake_files/${PROJECT_NAME}Config.cmake.in +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 diff --git a/SalomeMEDConfig.cmake.in b/SalomeMEDConfig.cmake.in new file mode 100644 index 000000000..29a8077be --- /dev/null +++ b/SalomeMEDConfig.cmake.in @@ -0,0 +1,139 @@ +# - Config file for the @PROJECT_NAME@ package +# It defines the following variables. +# Specific to the pacakge @PROJECT_NAME@ itself: +# @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file +# + +############################################################### +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or +# email : webmaster.salome@opencascade.com +############################################################### + +### Initialisation performed by CONFIGURE_PACKAGE_CONFIG_FILE: +@PACKAGE_INIT@ + +# Load the dependencies for the libraries of @PROJECT_NAME@ +# (contains definitions for IMPORTED targets). This is only +# imported if we are not built as a subproject (in this case targets are already there) +IF(NOT TARGET medcoupling AND NOT @PROJECT_NAME@_BINARY_DIR) + INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake") +ENDIF() + +# Package root dir: +SET_AND_CHECK(MED_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") + +# Include directories and definitions +SET_AND_CHECK(MED_INCLUDE_DIRS "${MED_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") +SET(MED_DEFINITIONS) + +#### Now the specificities + +# Options exported by the package: +SET(SALOME_MED_STANDALONE @SALOME_MED_STANDALONE@) +SET(SALOME_MED_MICROMED @SALOME_MED_MICROMED@) +SET(SALOME_MED_ENABLE_PYTHON @SALOME_MED_ENABLE_PYTHON@) +SET(SALOME_USE_MPI @SALOME_USE_MPI@) +SET(SALOME_BUILD_DOC @SALOME_BUILD_DOC@) +SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@) +SET(SALOME_BUILD_GUI @SALOME_BUILD_GUI@) + +# Advanced options + +# Level 1 prerequisites: + +# Optional level 1 prerequisites: + +IF(NOT SALOME_MED_MICROMED) + SET_AND_CHECK(MEDFILE_ROOT_DIR_EXP "@PACKAGE_MEDFILE_ROOT_DIR@") +ENDIF(NOT SALOME_MED_MICROMED) + +IF(NOT SALOME_MED_STANDALONE) + SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@") +ENDIF(NOT SALOME_MED_STANDALONE) +IF(SALOME_BUILD_GUI) + SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@") +ENDIF(SALOME_BUILD_GUI) + +# For all prerequisites, load the corresponding targets if the package was used +# in CONFIG mode. This ensures dependent projects link correctly +# without having to set LD_LIBRARY_PATH. +# Many of them will be automatically loaded from KERNEL or GUI: + +SET(_PREREQ) +SET(_PREREQ_CONFIG_DIR) + +IF(NOT SALOME_MED_MICROMED) + LIST(APPEND _PREREQ HDF5 MEDFile ) + LIST(APPEND _PREREQ_CONFIG_DIR "@HDF5_DIR@" "@MEDFile_DIR@") +ENDIF() + +LIST(LENGTH _PREREQ_CONFIG_DIR _list_len) +# Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ... +MATH(EXPR _range "${_list_len}-1") +FOREACH(_p RANGE ${_range}) + LIST(GET _PREREQ ${_p} _pkg ) + LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir) + IF(_pkg_dir) + MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...") + FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE + PATHS "${_pkg_dir}" + NO_DEFAULT_PATH) + ENDIF() +ENDFOREACH() + +# Installation directories +SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@") +SET(SALOME_INSTALL_LIBS "@SALOME_INSTALL_LIBS@") +SET(SALOME_INSTALL_IDLS "@SALOME_INSTALL_IDLS@") +SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@") +SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@") +SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@") +SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@") +SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@") +SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") +SET(SALOME_INSTALL_CMAKE "@SALOME_INSTALL_CMAKE@") +SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@") +SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@") +SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@") +SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@") + +# Include KERNEL targets if they were not already loaded: +IF(NOT (TARGET SALOMEBasics) AND NOT SALOME_MED_STANDALONE) + INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake") +ENDIF() + +# Include GUI targets if they were not already loaded: +IF(NOT (TARGET Event) AND SALOME_BUILD_GUI) + INCLUDE("${GUI_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeGUITargets.cmake") +ENDIF() + + +# Exposed MED targets: +SET(MED_interpkernel interpkernel) +SET(MED_medcoupling medcoupling) +SET(MED_medcouplingremapper medcouplingremapper) +SET(MED_medloader medloader) +SET(MED_paramedmem paramedmem) +SET(MED_paramedloader paramedloader) +SET(MED_SalomeIDLMED SalomeIDLMED) +SET(MED_medcouplingcorba medcouplingcorba) +SET(MED_medcouplingclient medcouplingclient) diff --git a/adm_local/cmake_files/SalomeMEDConfig.cmake.in b/adm_local/cmake_files/SalomeMEDConfig.cmake.in deleted file mode 100644 index 29a8077be..000000000 --- a/adm_local/cmake_files/SalomeMEDConfig.cmake.in +++ /dev/null @@ -1,139 +0,0 @@ -# - Config file for the @PROJECT_NAME@ package -# It defines the following variables. -# Specific to the pacakge @PROJECT_NAME@ itself: -# @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file -# - -############################################################### -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or -# email : webmaster.salome@opencascade.com -############################################################### - -### Initialisation performed by CONFIGURE_PACKAGE_CONFIG_FILE: -@PACKAGE_INIT@ - -# Load the dependencies for the libraries of @PROJECT_NAME@ -# (contains definitions for IMPORTED targets). This is only -# imported if we are not built as a subproject (in this case targets are already there) -IF(NOT TARGET medcoupling AND NOT @PROJECT_NAME@_BINARY_DIR) - INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake") -ENDIF() - -# Package root dir: -SET_AND_CHECK(MED_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") - -# Include directories and definitions -SET_AND_CHECK(MED_INCLUDE_DIRS "${MED_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") -SET(MED_DEFINITIONS) - -#### Now the specificities - -# Options exported by the package: -SET(SALOME_MED_STANDALONE @SALOME_MED_STANDALONE@) -SET(SALOME_MED_MICROMED @SALOME_MED_MICROMED@) -SET(SALOME_MED_ENABLE_PYTHON @SALOME_MED_ENABLE_PYTHON@) -SET(SALOME_USE_MPI @SALOME_USE_MPI@) -SET(SALOME_BUILD_DOC @SALOME_BUILD_DOC@) -SET(SALOME_BUILD_TESTS @SALOME_BUILD_TESTS@) -SET(SALOME_BUILD_GUI @SALOME_BUILD_GUI@) - -# Advanced options - -# Level 1 prerequisites: - -# Optional level 1 prerequisites: - -IF(NOT SALOME_MED_MICROMED) - SET_AND_CHECK(MEDFILE_ROOT_DIR_EXP "@PACKAGE_MEDFILE_ROOT_DIR@") -ENDIF(NOT SALOME_MED_MICROMED) - -IF(NOT SALOME_MED_STANDALONE) - SET_AND_CHECK(KERNEL_ROOT_DIR_EXP "@PACKAGE_KERNEL_ROOT_DIR@") -ENDIF(NOT SALOME_MED_STANDALONE) -IF(SALOME_BUILD_GUI) - SET_AND_CHECK(GUI_ROOT_DIR_EXP "@PACKAGE_GUI_ROOT_DIR@") -ENDIF(SALOME_BUILD_GUI) - -# For all prerequisites, load the corresponding targets if the package was used -# in CONFIG mode. This ensures dependent projects link correctly -# without having to set LD_LIBRARY_PATH. -# Many of them will be automatically loaded from KERNEL or GUI: - -SET(_PREREQ) -SET(_PREREQ_CONFIG_DIR) - -IF(NOT SALOME_MED_MICROMED) - LIST(APPEND _PREREQ HDF5 MEDFile ) - LIST(APPEND _PREREQ_CONFIG_DIR "@HDF5_DIR@" "@MEDFile_DIR@") -ENDIF() - -LIST(LENGTH _PREREQ_CONFIG_DIR _list_len) -# Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ... -MATH(EXPR _range "${_list_len}-1") -FOREACH(_p RANGE ${_range}) - LIST(GET _PREREQ ${_p} _pkg ) - LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir) - IF(_pkg_dir) - MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...") - FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE - PATHS "${_pkg_dir}" - NO_DEFAULT_PATH) - ENDIF() -ENDFOREACH() - -# Installation directories -SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@") -SET(SALOME_INSTALL_LIBS "@SALOME_INSTALL_LIBS@") -SET(SALOME_INSTALL_IDLS "@SALOME_INSTALL_IDLS@") -SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@") -SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@") -SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@") -SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@") -SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@") -SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") -SET(SALOME_INSTALL_CMAKE "@SALOME_INSTALL_CMAKE@") -SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@") -SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@") -SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@") -SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@") - -# Include KERNEL targets if they were not already loaded: -IF(NOT (TARGET SALOMEBasics) AND NOT SALOME_MED_STANDALONE) - INCLUDE("${KERNEL_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeKERNELTargets.cmake") -ENDIF() - -# Include GUI targets if they were not already loaded: -IF(NOT (TARGET Event) AND SALOME_BUILD_GUI) - INCLUDE("${GUI_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeGUITargets.cmake") -ENDIF() - - -# Exposed MED targets: -SET(MED_interpkernel interpkernel) -SET(MED_medcoupling medcoupling) -SET(MED_medcouplingremapper medcouplingremapper) -SET(MED_medloader medloader) -SET(MED_paramedmem paramedmem) -SET(MED_paramedloader paramedloader) -SET(MED_SalomeIDLMED SalomeIDLMED) -SET(MED_medcouplingcorba medcouplingcorba) -SET(MED_medcouplingclient medcouplingclient)