From 00dcb6b8894b43cdfaab7072754fa98c0f45bb30 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Thu, 19 Sep 2013 08:14:14 +0000 Subject: [PATCH] Next try git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30821 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/CMakeLists.txt | 4 ++-- tests/a-framework/CMakeLists.txt | 2 ++ tests/all-headers/CMakeLists.txt | 2 ++ tests/aniso/CMakeLists.txt | 2 ++ tests/base/CMakeLists.txt | 2 ++ tests/bits/CMakeLists.txt | 2 ++ tests/cmake/setup_testsuite.cmake | 3 +-- tests/codim_one/CMakeLists.txt | 2 ++ tests/deal.II/CMakeLists.txt | 2 ++ tests/distributed_grids/CMakeLists.txt | 2 ++ tests/fail/CMakeLists.txt | 2 ++ tests/fe/CMakeLists.txt | 2 ++ tests/gla/CMakeLists.txt | 2 ++ tests/grid/CMakeLists.txt | 2 ++ tests/hp/CMakeLists.txt | 2 ++ tests/integrators/CMakeLists.txt | 2 ++ tests/lac/CMakeLists.txt | 2 ++ tests/lapack/CMakeLists.txt | 2 ++ tests/matrix_free/CMakeLists.txt | 2 ++ tests/metis/CMakeLists.txt | 2 ++ tests/mpi/CMakeLists.txt | 2 ++ tests/multigrid/CMakeLists.txt | 2 ++ tests/petsc/CMakeLists.txt | 2 ++ tests/serialization/CMakeLists.txt | 2 ++ tests/slepc/CMakeLists.txt | 2 ++ tests/trilinos/CMakeLists.txt | 2 ++ tests/umfpack/CMakeLists.txt | 2 ++ 27 files changed, 53 insertions(+), 4 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index debb34b951..ef3167c9ed 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 132a53d483..577973f992 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 2726070d01..53d56a5e31 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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 80ff54bdfe..a51b880d4f 100644 --- 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() -- 2.39.5