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 cd334b751ea5877f7daf67689e653a8a24ac1f47..2523763f64098397f4d1e19597b0e470b21ef0d1 100644 (file)
--- 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 681d3851bfb2b1933c5cecee24027d2946ac084b..d9baf3976a682fc1e26407b112f31b8b81329173 100644 (file)
--- 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()