Next try

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30821 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index debb34b951eeb3a7bafc2b2eb5d79951ae30e34c..ef3167c9ed7b2c4c72d359814e6170b9bc83b9fc 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -25,7 +25,7 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 MESSAGE(STATUS "Proceed to test definitions now.")
-PROJECT(deal.II-testsuite)
+PROJECT(deal.II-testsuite NONE)
 ENABLE_TESTING()
 
 SET(_options)
@@ -60,7 +60,7 @@ FOREACH(_var ${_variables})
   IF(_var MATCHES
       "^(TEST_DIR|TEST_DIFF|TEST_TIME_LIMIT|TEST_PICKUP_REGEX|NUMDIFF_DIR)$"
       )
-    LIST(APPEND _options -D${_var}="${${_var}}")
+    LIST(APPEND _options "-D${_var}=${${_var}}")
   ENDIF()
 ENDFOREACH()
 

diff --git a/tests/a-framework/CMakeLists.txt b/tests/a-framework/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/a-framework/CMakeLists.txt
+++ b/tests/a-framework/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/all-headers/CMakeLists.txt b/tests/all-headers/CMakeLists.txt
index 132a53d4832bf460cd7d8c11b5d35bb974a2714d..577973f9922f51f138bf852a1a2bd539c8361619 100644 (file)
--- a/tests/all-headers/CMakeLists.txt
+++ b/tests/all-headers/CMakeLists.txt
@@ -16,6 +16,8 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 
 #
 # Header tests are special:

diff --git a/tests/aniso/CMakeLists.txt b/tests/aniso/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/aniso/CMakeLists.txt
+++ b/tests/aniso/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/base/CMakeLists.txt b/tests/base/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/base/CMakeLists.txt
+++ b/tests/base/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/bits/CMakeLists.txt b/tests/bits/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/bits/CMakeLists.txt
+++ b/tests/bits/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/cmake/setup_testsuite.cmake b/tests/cmake/setup_testsuite.cmake
index 2726070d0108d00dd884b9979fc48489ac2071bf..53d56a5e3152bf391bf61ecfd69e95687e4a5fc7 100644 (file)
--- a/tests/cmake/setup_testsuite.cmake
+++ b/tests/cmake/setup_testsuite.cmake
@@ -30,7 +30,6 @@
 #     TEST_TIME_LIMIT
 #     TEST_PICKUP_REGEX
 #
-#
 
 #
 # Load all macros:
@@ -59,7 +58,7 @@ SET_IF_EMPTY(TEST_PICKUP_REGEX $ENV{TEST_PICKUP_REGEX})
 FIND_PACKAGE(deal.II 8.0 REQUIRED
   HINTS ${DEAL_II_BINARY_DIR} ${DEAL_II_DIR}
   )
-INCLUDE(${DEAL_II_TARGET_CONFIG})
+SET(CMAKE_CXX_COMPILER ${DEAL_II_CXX_COMPILER} CACHE STRING "CXX Compiler.")
 
 FIND_PACKAGE(Perl REQUIRED)
 

diff --git a/tests/codim_one/CMakeLists.txt b/tests/codim_one/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/codim_one/CMakeLists.txt
+++ b/tests/codim_one/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/deal.II/CMakeLists.txt b/tests/deal.II/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/deal.II/CMakeLists.txt
+++ b/tests/deal.II/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/distributed_grids/CMakeLists.txt b/tests/distributed_grids/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/distributed_grids/CMakeLists.txt
+++ b/tests/distributed_grids/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/fail/CMakeLists.txt b/tests/fail/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/fail/CMakeLists.txt
+++ b/tests/fail/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/fe/CMakeLists.txt b/tests/fe/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/fe/CMakeLists.txt
+++ b/tests/fe/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/gla/CMakeLists.txt b/tests/gla/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/gla/CMakeLists.txt
+++ b/tests/gla/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/grid/CMakeLists.txt b/tests/grid/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/grid/CMakeLists.txt
+++ b/tests/grid/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/hp/CMakeLists.txt b/tests/hp/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/hp/CMakeLists.txt
+++ b/tests/hp/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/integrators/CMakeLists.txt b/tests/integrators/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/integrators/CMakeLists.txt
+++ b/tests/integrators/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/lac/CMakeLists.txt b/tests/lac/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/lac/CMakeLists.txt
+++ b/tests/lac/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/lapack/CMakeLists.txt b/tests/lapack/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/lapack/CMakeLists.txt
+++ b/tests/lapack/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/matrix_free/CMakeLists.txt b/tests/matrix_free/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/matrix_free/CMakeLists.txt
+++ b/tests/matrix_free/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/metis/CMakeLists.txt b/tests/metis/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/metis/CMakeLists.txt
+++ b/tests/metis/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/mpi/CMakeLists.txt b/tests/mpi/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/mpi/CMakeLists.txt
+++ b/tests/mpi/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/multigrid/CMakeLists.txt b/tests/multigrid/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/multigrid/CMakeLists.txt
+++ b/tests/multigrid/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/petsc/CMakeLists.txt b/tests/petsc/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/petsc/CMakeLists.txt
+++ b/tests/petsc/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/serialization/CMakeLists.txt b/tests/serialization/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/serialization/CMakeLists.txt
+++ b/tests/serialization/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/slepc/CMakeLists.txt b/tests/slepc/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/slepc/CMakeLists.txt
+++ b/tests/slepc/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/trilinos/CMakeLists.txt b/tests/trilinos/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/trilinos/CMakeLists.txt
+++ b/tests/trilinos/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()

diff --git a/tests/umfpack/CMakeLists.txt b/tests/umfpack/CMakeLists.txt
index 80ff54bdfecddd80c5f8ff37ed55abffac75c721..a51b880d4ffad7c62903fd19506a097d25728cbe 100644 (file)
--- a/tests/umfpack/CMakeLists.txt
+++ b/tests/umfpack/CMakeLists.txt
@@ -1,3 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${TEST_DIR}/cmake/setup_testsuite.cmake)
+PROJECT(testsuite CXX)
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 DEAL_II_PICKUP_TESTS()