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

Always append CONFIG_VARS to ${module}_CONFIG_VARS.

Browse Source 
It seems like this variable was not empty for e.g. dune-grid
and therefore we did not add some necessary defines before this
commit.
This commit is contained in:
Markus Blatt
2017-09-29 11:02:14 +02:00
parent f5bf291f7d
commit 38e198d961
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmake/Modules/OpmPackage.cmake
View File

@@ -145,16 +145,14 @@ macro (find_opm_package module deps header lib defs prog conf)
# tidy the lists before returning them
remove_dup_deps (${module})
if( NOT ${module}_CONFIG_VARS)
# these defines are used in dune/${module} headers, and should be put
# in config.h when we include those
foreach (_var IN ITEMS ${conf})
# massage the name to remove source code formatting
string (REGEX REPLACE "^[\n\t\ ]+" "" _var "${_var}")
string (REGEX REPLACE "[\n\t\ ]+$" "" _var "${_var}")
list (APPEND ${module}_CONFIG_VARS ${_var})
endforeach (_var)
endif()
# these defines are used in dune/${module} headers, and should be put
# in config.h when we include those
foreach (_var IN ITEMS ${conf})
# massage the name to remove source code formatting
string (REGEX REPLACE "^[\n\t\ ]+" "" _var "${_var}")
string (REGEX REPLACE "[\n\t\ ]+$" "" _var "${_var}")
list (APPEND ${module}_CONFIG_VARS ${_var})
endforeach (_var)
# these are the defines that should be set when compiling
# without config.h