OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #306 from blattms/fix-pr-304

Browse Source 
Include <module>-prereqs.cmake in <module>-config.cmake to process all dependencies
This commit is contained in:
Arne Morten Kvarving
2017-12-21 14:00:32 +01:00
committed by GitHub
parent 390bf74f66 4c0625aa8b
commit 8fc5283b05
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/Modules/OpmInstall.cmake
View File

@@ -61,4 +61,8 @@ macro (opm_install opm)
FILES ${PROJECT_SOURCE_DIR}/dune.module FILES ${PROJECT_SOURCE_DIR}/dune.module
DESTINATION lib/${${opm}_VER_DIR}/dunecontrol/${${opm}_NAME} DESTINATION lib/${${opm}_VER_DIR}/dunecontrol/${${opm}_NAME}
) )
install (
FILES ${PROJECT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}-prereqs.cmake
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/opm/cmake/Modules
)
endmacro (opm_install opm) endmacro (opm_install opm)

2
cmake/Modules/OpmProject.cmake
View File

@@ -77,6 +77,7 @@ function (opm_cmake_config name)
# write configuration file to locate library # write configuration file to locate library
set(OPM_PROJECT_EXTRA_CODE ${OPM_PROJECT_EXTRA_CODE_INTREE}) set(OPM_PROJECT_EXTRA_CODE ${OPM_PROJECT_EXTRA_CODE_INTREE})
set(PREREQ_LOCATION "${PROJECT_SOURCE_DIR}")
configure_cmake_file (${name} "config" "") configure_cmake_file (${name} "config" "")
configure_cmake_file (${name} "config" "-version") configure_cmake_file (${name} "config" "-version")
configure_vars ( configure_vars (
@@ -114,6 +115,7 @@ function (opm_cmake_config name)
# create a config mode file which targets the install directory instead # create a config mode file which targets the install directory instead
# of the build directory (using the same input template) # of the build directory (using the same input template)
set(OPM_PROJECT_EXTRA_CODE ${OPM_PROJECT_EXTRA_CODE_INSTALLED}) set(OPM_PROJECT_EXTRA_CODE ${OPM_PROJECT_EXTRA_CODE_INSTALLED})
set(PREREQ_LOCATION "${CMAKE_INSTALL_PREFIX}/share/opm/cmake/Modules")
configure_cmake_file (${name} "install" "") configure_cmake_file (${name} "install" "")
configure_vars ( configure_vars (
FILE CMAKE "${PROJECT_BINARY_DIR}/${${name}_NAME}-install.cmake" FILE CMAKE "${PROJECT_BINARY_DIR}/${${name}_NAME}-install.cmake"

3
cmake/Templates/opm-project-config.cmake.in
View File

@@ -21,7 +21,8 @@
# Prevent multiple inclusions # Prevent multiple inclusions
if(NOT @opm-project_NAME@_FOUND) if(NOT @opm-project_NAME@_FOUND)
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" @PREREQ_LOCATION@)
include(@opm-project_NAME@-prereqs)
# propagate these properties from one build system to the other # propagate these properties from one build system to the other
set (@opm-project_NAME@_VERSION "@opm-project_VERSION@") set (@opm-project_NAME@_VERSION "@opm-project_VERSION@")
set (@opm-project_NAME@_DEFINITIONS "@opm-project_DEFINITIONS@") set (@opm-project_NAME@_DEFINITIONS "@opm-project_DEFINITIONS@")