From: maier Date: Sat, 26 Oct 2013 09:14:19 +0000 (+0000) Subject: Bugfix: Be more greedy and cache test configurations in subprojects X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1ab779ab3cc420954e733671ffdd02b6e42f294;p=dealii-svn.git Bugfix: Be more greedy and cache test configurations in subprojects git-svn-id: https://svn.dealii.org/trunk@31430 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/setup_testsuite.cmake b/deal.II/cmake/setup_testsuite.cmake index cd334b751e..2523763f64 100644 --- a/deal.II/cmake/setup_testsuite.cmake +++ b/deal.II/cmake/setup_testsuite.cmake @@ -45,13 +45,19 @@ ENDFOREACH() # # Pick up values from environment: # -SET_IF_EMPTY(DEAL_II_BINARY_DIR $ENV{DEAL_II_BINARY_DIR}) -SET_IF_EMPTY(DEAL_II_BINARY_DIR $ENV{DEAL_II_DIR}) -SET_IF_EMPTY(DEAL_II_SOURCE_DIR $ENV{DEAL_II_SOURCE_DIR}) -SET_IF_EMPTY(TEST_DIFF $ENV{TEST_DIFF}) -SET_IF_EMPTY(TEST_TIME_LIMIT $ENV{TEST_TIME_LIMIT}) -SET_IF_EMPTY(TEST_PICKUP_REGEX $ENV{TEST_PICKUP_REGEX}) -SET_IF_EMPTY(TEST_OVERRIDE_LOCATION $ENV{TEST_OVERRIDE_LOCATION}) +FOREACH(_var + DEAL_II_BINARY_DIR + DEAL_II_SOURCE_DIR + TEST_DIFF + TEST_TIME_LIMIT + TEST_PICKUP_REGEX + TEST_OVERRIDE_LOCATION + ) + SET_IF_EMPTY(${_var} $ENV{${_var}}) + IF(NOT "${_var}" STREQUAL "") + SET(_var "${_var}" CACHE STRING "") + ENDIF() +ENDFOREACH() # # We need deal.II and Perl as external packages: diff --git a/deal.II/tests/CMakeLists.txt b/deal.II/tests/CMakeLists.txt index 681d3851bf..d9baf3976a 100644 --- a/deal.II/tests/CMakeLists.txt +++ b/deal.II/tests/CMakeLists.txt @@ -60,7 +60,6 @@ FOREACH(_var TEST_PICKUP_REGEX TEST_TIME_LIMIT ) - LIST(APPEND _options "-U${_var}") IF(DEFINED ${_var}) LIST(APPEND _options "-D${_var}=${${_var}}") ENDIF()