From 1f2f8e5e6722f181ad6ab62131c7e3da39d20ab4 Mon Sep 17 00:00:00 2001 From: maier Date: Sun, 3 Nov 2013 00:33:24 +0000 Subject: [PATCH] Bugfix/Improvement: Pass down (almost) all possible configuration options down to cmake git-svn-id: https://svn.dealii.org/trunk@31523 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/scripts/run_testsuite.cmake | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/deal.II/cmake/scripts/run_testsuite.cmake b/deal.II/cmake/scripts/run_testsuite.cmake index 7f07851263..f8130b4c49 100644 --- a/deal.II/cmake/scripts/run_testsuite.cmake +++ b/deal.II/cmake/scripts/run_testsuite.cmake @@ -258,12 +258,16 @@ IF("${TRACK}" STREQUAL "Build Tests") SET(TEST_PICKUP_REGEX "^build_tests") ENDIF() -# Pass all relevant "TEST_" variables down to configure: +# Pass all relevant variables down to configure: GET_CMAKE_PROPERTY(_variables VARIABLES) FOREACH(_var ${_variables}) - IF(_var MATCHES - "^(TEST_DIFF|TEST_TIME_LIMIT|TEST_PICKUP_REGEX|TEST_OVERRIDE_LOCATION|NUMDIFF_DIR)$" - ) + IF( _var MATCHES "^(TEST|DEAL_II)_" OR + _var MATCHES "^(ARPACK|BOOST|FUNCTIONPARSER|HDF5|METIS|MPI|MUMPS)_" OR + _var MATCHES "^(NETCDF|P4EST|PETSC|SLEPC|THREADS|TBB|TRILINOS)_" OR + _var MATCHES "^(UMFPACK|ZLIB|LAPACK)_" OR + _var MATCHES "^(CMAKE|DEAL_II)_(C|CXX|Fortran|BUILD)_(COMPILER|FLAGS)" OR + _var MATCHES "^CMAKE_BUILD_TYPE$" OR + ( NOT _var MATCHES "^[_]*CMAKE" AND _var MATCHES "_DIR$" ) ) LIST(APPEND _options "-D${_var}=${${_var}}") ENDIF() ENDFOREACH() @@ -483,6 +487,8 @@ MACRO(CLEAR_TARGETDIRECTORIES_TXT) ) ENDMACRO() +MESSAGE("-- CMake Options: ${_options}") + ######################################################################## # # -- 2.39.5