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

[cmake] do not export dune-istl version but use module local detection.

Browse Source 
According to @rolk defines should only be exported in
cmake/Modules/<module>-prereqs.cmake if they are used in the
headers. This is not the case for the dune-istl version macros and
therefore we use opm_need_version_of in the config_hook in the top
level CMakefile with this patch.
This commit is contained in:
Markus Blatt 2014-03-19 15:15:55 +01:00
parent cf7f07b179
commit 1ad8381b04
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -46,6 +46,7 @@ include (CMakeLists_files.cmake)
macro (config_hook) macro (config_hook)
# opm_need_version_of ("dune-common") # opm_need_version_of ("dune-common")
opm_need_version_of ("dune-istl")
list (APPEND ${project}_CONFIG_IMPL_VARS list (APPEND ${project}_CONFIG_IMPL_VARS
HAVE_DUNE_ISTL HAVE_DUNE_ISTL
) )

3
cmake/Modules/opm-core-prereqs.cmake
View File

@ -3,9 +3,6 @@
# defines that must be present in config.h for our headers # defines that must be present in config.h for our headers
set (opm-core_CONFIG_VAR set (opm-core_CONFIG_VAR
DUNE_ISTL_VERSION_MAJOR
DUNE_ISTL_VERSION_MINOR
DUNE_ISTL_VERSION_REVISION
HAVE_ERT HAVE_ERT
HAVE_SUITESPARSE_UMFPACK_H HAVE_SUITESPARSE_UMFPACK_H
) )