OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-30 21:13:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Put HAVE_DYNAMIC_BOOST_TEST in config.h for tests only

Browse Source 
This define is used by the unit tests; there is no reason why it should
be on the list that must be provided by other projects that use our
headers (the other projects don't use our tests).
This commit is contained in:
Roland Kaufmann 2013-08-14 20:28:16 +02:00
parent 6537f63307
commit fa32d2a03e
8 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/Modules/OpmLibMain.cmake
View File

@ -145,11 +145,16 @@ list (APPEND ${project}_CONFIG_VARS ${${project}_CONFIG_VAR})
# write configuration variables to this file. note that it is a temporary.
# _CONFIG_IMPL_VARS are defines that are only written to config.h internal
# to this project; they are not exported to any installed files.
# TESTING_CONFIG_VARS is what's required by the unit tests, and is therefore
# added in an ad-hoc manner to avoid putting dependencies to it in the module
# requirement file. (it should be added if there is .h code that needs it)
message (STATUS "Writing config file \"${PROJECT_BINARY_DIR}/config.h\"...")
set (CONFIG_H "${PROJECT_BINARY_DIR}/config.h.tmp")
configure_vars (
FILE CXX ${CONFIG_H}
WRITE ${${project}_CONFIG_VARS} ${${project}_CONFIG_IMPL_VARS}
WRITE ${${project}_CONFIG_VARS}
${${project}_CONFIG_IMPL_VARS}
${TESTING_CONFIG_VARS}
)
# call this hook to let it setup necessary conditions for Fortran support

3
cmake/Modules/UseDynamicBoost.cmake
View File

@ -31,3 +31,6 @@ endif (${Boost_UNIT_TEST_FRAMEWORK_FOUND})
set (HAVE_DYNAMIC_BOOST_TEST "${HAVE_DYNAMIC_BOOST_TEST}"
CACHE BOOL "Whether Boost::Test is dynamically linked or not"
)
# include in config.h
list (APPEND TESTING_CONFIG_VARS "HAVE_DYNAMIC_BOOST_TEST")

1
cmake/Modules/dune-cornerpoint-prereqs.cmake
View File

@ -3,7 +3,6 @@
# defines that must be present in config.h for our headers
set (dune-cornerpoint_CONFIG_VAR
HAVE_DYNAMIC_BOOST_TEST
DUNE_GRID_VERSION_MAJOR
DUNE_GRID_VERSION_MINOR
DUNE_GRID_VERSION_REVISION

1
cmake/Modules/opm-autodiff-prereqs.cmake
View File

@ -3,7 +3,6 @@
# defines that must be present in config.h for our headers
set (opm-autodiff_CONFIG_VAR
HAVE_DYNAMIC_BOOST_TEST
)
# dependencies

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

@ -4,7 +4,6 @@
# defines that must be present in config.h for our headers
set (opm-core_CONFIG_VAR
HAVE_DUNE_ISTL
HAVE_DYNAMIC_BOOST_TEST
HAVE_ERT
HAVE_SUITESPARSE_UMFPACK_H
HAVE_NULLPTR

1
cmake/Modules/opm-polymer-prereqs.cmake
View File

@ -3,7 +3,6 @@
# defines that must be present in config.h for our headers
set (opm-polymer_CONFIG_VAR
HAVE_DYNAMIC_BOOST_TEST
HAVE_ERT
)

1
cmake/Modules/opm-porsol-prereqs.cmake
View File

@ -3,7 +3,6 @@
# defines that must be present in config.h for our headers
set (opm-porsol_CONFIG_VAR
HAVE_DYNAMIC_BOOST_TEST
HAVE_VALGRIND
)

1
cmake/Modules/opm-upscaling-prereqs.cmake
View File

@ -3,7 +3,6 @@
# defines that must be present in config.h for our headers
set (opm-upscaling_CONFIG_VAR
HAVE_DYNAMIC_BOOST_TEST
HAVE_LAPACK
HAVE_SUPERLU
)