From: Matthias Maier Date: Sat, 28 Mar 2015 22:24:47 +0000 (+0100) Subject: Testsuite: Refactor tests/CMakeLists.txt X-Git-Tag: v8.3.0-rc1~343^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35a39d0b8ae77a963e353500d79e2665214a2eb3;p=dealii.git Testsuite: Refactor tests/CMakeLists.txt As it turns out, it is now reasonably straight forward to restructure tests/CMakeLists.txt to be also configured as an independent project. This is particularly useful to test a given deal.II installation at an independent, later time (without the binary directory being available any more). --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 07032657f4..56a4f749f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,6 @@ IF(POLICY CMP0037) CMAKE_POLICY(SET CMP0037 OLD) ENDIF() - LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/) # diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d611c3db6f..ef3b2dc842 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,7 +14,7 @@ ## --------------------------------------------------------------------- # -# Setup the testsuite. +# Set up the testsuite. # # We define toplevel targets: # setup_tests - set up testsuite subprojects @@ -23,33 +23,60 @@ # prune_tests - remove all testsuite subprojects # +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) + +MACRO(SET_IF_EMPTY _variable) + IF("${${_variable}}" STREQUAL "") + SET(${_variable} ${ARGN}) + ENDIF() +ENDMACRO() + SET_IF_EMPTY(MAKEOPTS $ENV{MAKEOPTS}) -# -# First of all, our quicktests: -# +IF(DEFINED DEAL_II_HAVE_TESTS_DIRECTORY) -ADD_SUBDIRECTORY(quick_tests) + IF(POLICY CMP0037) + # allow to override "test" target for quick tests + CMAKE_POLICY(SET CMP0037 OLD) + ENDIF() -# -# Write minimalistic CTestTestfile.cmake files to CMAKE_BINARY_DIR and -# CMAKE_BINARY_DIR/tests: -# + # + # If this CMakeLists.txt file is called from within the deal.II build + # system, set up quick tests as well: + # + ADD_SUBDIRECTORY(quick_tests) + + MESSAGE(STATUS "Setting up testsuite") -MESSAGE(STATUS "Setting up testsuite") + # + # Write minimalistic CTestTestfile.cmake files to CMAKE_BINARY_DIR and + # CMAKE_BINARY_DIR/tests: + # + FILE(WRITE ${CMAKE_BINARY_DIR}/CTestTestfile.cmake "SUBDIRS(tests)") -FILE(WRITE ${CMAKE_BINARY_DIR}/CTestTestfile.cmake "SUBDIRS(tests)") -FILE(WRITE ${CMAKE_BINARY_DIR}/tests/CTestTestfile.cmake "") + SET(_options "-DDEAL_II_DIR=${CMAKE_BINARY_DIR}") + +ELSE() + + MESSAGE(STATUS "This is CMake ${CMAKE_VERSION}") + MESSAGE(STATUS "") + + IF("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") + MESSAGE(FATAL_ERROR "The testsuite cannot be configured in-source. " + "Please create a separate build directory" + ) + ENDIF() + + FIND_PACKAGE(deal.II 8.3 REQUIRED HINTS ${DEAL_II_DIR} $ENV{DEAL_II_DIR}) + PROJECT(testsuite NONE) + SET(_options "-DDEAL_II_DIR=${DEAL_II_PATH}") +ENDIF() + +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake "") # -# A config line for tests: +# Append further configuration to _options: # - -SET(_options "") -LIST(APPEND _options - -DDEAL_II_DIR=${CMAKE_BINARY_DIR} - -DDEAL_II_SOURCE_DIR=${CMAKE_SOURCE_DIR} - ) FOREACH(_var DIFF_DIR NUMDIFF_DIR TEST_DIFF TEST_PICKUP_REGEX TEST_TIME_LIMIT MPIEXEC MPIEXEC_NUMPROC_FLAG MPIEXEC_PREFLAGS MPIEXEC_POSTFLAGS @@ -84,12 +111,12 @@ ADD_CUSTOM_TARGET(regen_tests) ADD_CUSTOM_TARGET(clean_tests) FOREACH(_category ${_categories}) - SET(_category_dir ${CMAKE_SOURCE_DIR}/tests/${_category}) + SET(_category_dir ${CMAKE_CURRENT_SOURCE_DIR}/${_category}) ADD_CUSTOM_TARGET(setup_tests_${_category} COMMAND ${CMAKE_COMMAND} -E make_directory - ${CMAKE_BINARY_DIR}/tests/${_category} - COMMAND cd ${CMAKE_BINARY_DIR}/tests/${_category} && + ${CMAKE_CURRENT_BINARY_DIR}/${_category} + COMMAND cd ${CMAKE_CURRENT_BINARY_DIR}/${_category} && ${CMAKE_COMMAND} -G${CMAKE_GENERATOR} ${_options} ${_category_dir} > /dev/null COMMENT "Processing tests/${_category}" @@ -98,31 +125,33 @@ FOREACH(_category ${_categories}) ADD_CUSTOM_TARGET(prune_tests_${_category} COMMAND ${CMAKE_COMMAND} -E remove_directory - ${CMAKE_BINARY_DIR}/tests/${_category} + ${CMAKE_CURRENT_BINARY_DIR}/${_category} COMMENT "Processing tests/${_category}" ) ADD_DEPENDENCIES(prune_tests prune_tests_${_category}) ADD_CUSTOM_TARGET(regen_tests_${_category} COMMAND - test ! -d ${CMAKE_BINARY_DIR}/tests/${_category} || ${CMAKE_COMMAND} - --build ${CMAKE_BINARY_DIR}/tests/${_category} --target regenerate + test ! -d ${CMAKE_CURRENT_BINARY_DIR}/${_category} || ${CMAKE_COMMAND} + --build ${CMAKE_CURRENT_BINARY_DIR}/${_category} --target regenerate COMMENT "Processing tests/${_category}" ) ADD_DEPENDENCIES(regen_tests regen_tests_${_category}) ADD_CUSTOM_TARGET(clean_tests_${_category} COMMAND - test ! -d ${CMAKE_BINARY_DIR}/tests/${_category} || ${CMAKE_COMMAND} - --build ${CMAKE_BINARY_DIR}/tests/${_category} --target clean + test ! -d ${CMAKE_CURRENT_BINARY_DIR}/${_category} || ${CMAKE_COMMAND} + --build ${CMAKE_CURRENT_BINARY_DIR}/${_category} --target clean COMMENT "Processing tests/${_category}" ) ADD_DEPENDENCIES(clean_tests clean_tests_${_category}) - FILE(APPEND ${CMAKE_BINARY_DIR}/tests/CTestTestfile.cmake + FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake "SUBDIRS(${_category})\n" ) ENDFOREACH() -MESSAGE(STATUS "Setting up testsuite - Done") +IF(DEFINED DEAL_II_HAVE_TESTS_DIRECTORY) + MESSAGE(STATUS "Setting up testsuite - Done") +ENDIF() diff --git a/tests/a-framework/CMakeLists.txt b/tests/a-framework/CMakeLists.txt index a86dc6e639..96fa5ad7f3 100644 --- a/tests/a-framework/CMakeLists.txt +++ b/tests/a-framework/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/algorithms/CMakeLists.txt b/tests/algorithms/CMakeLists.txt index bd1bc1e332..f8ac3eb029 100644 --- a/tests/algorithms/CMakeLists.txt +++ b/tests/algorithms/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/all-headers/CMakeLists.txt b/tests/all-headers/CMakeLists.txt index b63e1a3f9c..eda1e78467 100644 --- a/tests/all-headers/CMakeLists.txt +++ b/tests/all-headers/CMakeLists.txt @@ -14,7 +14,7 @@ ## --------------------------------------------------------------------- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) # @@ -36,8 +36,13 @@ SET(_category all-headers) # Glob together all header files and strip SOURCE_DIR/include/deal.II to # get a correct relative path: # -FILE(GLOB_RECURSE _headers RELATIVE ${DEAL_II_SOURCE_DIR}/include/deal.II - ${DEAL_II_SOURCE_DIR}/include/deal.II/*.h +IF(DEAL_II_BUILD_DIR) + LIST(GET DEAL_II_INCLUDE_DIRS 1 _include_dir) +ELSE() + LIST(GET DEAL_II_INCLUDE_DIRS 0 _include_dir) +ENDIF() +FILE(GLOB_RECURSE _headers RELATIVE ${_include_dir}/deal.II + ${_include_dir}/deal.II/*.h ) FOREACH(_header ${_headers}) diff --git a/tests/aniso/CMakeLists.txt b/tests/aniso/CMakeLists.txt index bd1bc1e332..f8ac3eb029 100644 --- a/tests/aniso/CMakeLists.txt +++ b/tests/aniso/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/arpack/CMakeLists.txt b/tests/arpack/CMakeLists.txt index 7b57c1e4e8..077c200af3 100644 --- a/tests/arpack/CMakeLists.txt +++ b/tests/arpack/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) IF(DEAL_II_WITH_ARPACK) DEAL_II_PICKUP_TESTS() diff --git a/tests/base/CMakeLists.txt b/tests/base/CMakeLists.txt index bd1bc1e332..f8ac3eb029 100644 --- a/tests/base/CMakeLists.txt +++ b/tests/base/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/bits/CMakeLists.txt b/tests/bits/CMakeLists.txt index bd1bc1e332..f8ac3eb029 100644 --- a/tests/bits/CMakeLists.txt +++ b/tests/bits/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/build_tests/CMakeLists.txt b/tests/build_tests/CMakeLists.txt index 33922a000e..189746d4c9 100644 --- a/tests/build_tests/CMakeLists.txt +++ b/tests/build_tests/CMakeLists.txt @@ -14,7 +14,7 @@ ## --------------------------------------------------------------------- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) # @@ -56,7 +56,7 @@ SET(_release_steps step-47 step-48 step-49 ) -FILE(GLOB _steps ${DEAL_II_SOURCE_DIR}/examples/step-*) +FILE(GLOB _steps ${DEAL_II_PATH}/${DEAL_II_EXAMPLES_RELDIR}/step-*) FOREACH(_step_full ${_steps}) GET_FILENAME_COMPONENT(_step ${_step_full} NAME) diff --git a/tests/codim_one/CMakeLists.txt b/tests/codim_one/CMakeLists.txt index bd1bc1e332..f8ac3eb029 100644 --- a/tests/codim_one/CMakeLists.txt +++ b/tests/codim_one/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/deal.II/CMakeLists.txt b/tests/deal.II/CMakeLists.txt index bd1bc1e332..f8ac3eb029 100644 --- a/tests/deal.II/CMakeLists.txt +++ b/tests/deal.II/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/distributed_grids/CMakeLists.txt b/tests/distributed_grids/CMakeLists.txt index 4c1a02d789..35240e341a 100644 --- a/tests/distributed_grids/CMakeLists.txt +++ b/tests/distributed_grids/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) IF(DEAL_II_WITH_P4EST) DEAL_II_PICKUP_TESTS() diff --git a/tests/fe/CMakeLists.txt b/tests/fe/CMakeLists.txt index bd1bc1e332..f8ac3eb029 100644 --- a/tests/fe/CMakeLists.txt +++ b/tests/fe/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/gla/CMakeLists.txt b/tests/gla/CMakeLists.txt index 3f784ff97f..77e5d6b974 100644 --- a/tests/gla/CMakeLists.txt +++ b/tests/gla/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) IF(DEAL_II_WITH_MPI AND DEAL_II_WITH_P4EST AND DEAL_II_WITH_PETSC AND DEAL_II_WITH_TRILINOS) DEAL_II_PICKUP_TESTS() diff --git a/tests/grid/CMakeLists.txt b/tests/grid/CMakeLists.txt index bd1bc1e332..f8ac3eb029 100644 --- a/tests/grid/CMakeLists.txt +++ b/tests/grid/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/hp/CMakeLists.txt b/tests/hp/CMakeLists.txt index bd1bc1e332..f8ac3eb029 100644 --- a/tests/hp/CMakeLists.txt +++ b/tests/hp/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/integrators/CMakeLists.txt b/tests/integrators/CMakeLists.txt index bd1bc1e332..f8ac3eb029 100644 --- a/tests/integrators/CMakeLists.txt +++ b/tests/integrators/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/lac/CMakeLists.txt b/tests/lac/CMakeLists.txt index bd1bc1e332..f8ac3eb029 100644 --- a/tests/lac/CMakeLists.txt +++ b/tests/lac/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/lapack/CMakeLists.txt b/tests/lapack/CMakeLists.txt index a57b08ece7..6f5b1fd5bd 100644 --- a/tests/lapack/CMakeLists.txt +++ b/tests/lapack/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) IF(DEAL_II_WITH_LAPACK) DEAL_II_PICKUP_TESTS() diff --git a/tests/manifold/CMakeLists.txt b/tests/manifold/CMakeLists.txt index 616b94a3b4..368fc54c3e 100644 --- a/tests/manifold/CMakeLists.txt +++ b/tests/manifold/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/matrix_free/CMakeLists.txt b/tests/matrix_free/CMakeLists.txt index bd1bc1e332..f8ac3eb029 100644 --- a/tests/matrix_free/CMakeLists.txt +++ b/tests/matrix_free/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/mesh_converter/CMakeLists.txt b/tests/mesh_converter/CMakeLists.txt index e606679744..7917e44d3a 100644 --- a/tests/mesh_converter/CMakeLists.txt +++ b/tests/mesh_converter/CMakeLists.txt @@ -14,7 +14,7 @@ ## --------------------------------------------------------------------- CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) # diff --git a/tests/metis/CMakeLists.txt b/tests/metis/CMakeLists.txt index 37c3ae108d..2f8188fd92 100644 --- a/tests/metis/CMakeLists.txt +++ b/tests/metis/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) IF(DEAL_II_WITH_METIS) DEAL_II_PICKUP_TESTS() diff --git a/tests/mpi/CMakeLists.txt b/tests/mpi/CMakeLists.txt index bd0697dbb7..ca793a01d5 100644 --- a/tests/mpi/CMakeLists.txt +++ b/tests/mpi/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) IF(DEAL_II_WITH_MPI AND DEAL_II_WITH_P4EST) DEAL_II_PICKUP_TESTS() diff --git a/tests/multigrid/CMakeLists.txt b/tests/multigrid/CMakeLists.txt index bd1bc1e332..f8ac3eb029 100644 --- a/tests/multigrid/CMakeLists.txt +++ b/tests/multigrid/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/opencascade/CMakeLists.txt b/tests/opencascade/CMakeLists.txt index e586a5e365..65ccd6dfb8 100644 --- a/tests/opencascade/CMakeLists.txt +++ b/tests/opencascade/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) IF(DEAL_II_WITH_OPENCASCADE) DEAL_II_PICKUP_TESTS() diff --git a/tests/petsc/CMakeLists.txt b/tests/petsc/CMakeLists.txt index e04dc4b2d6..3ad3bbefa3 100644 --- a/tests/petsc/CMakeLists.txt +++ b/tests/petsc/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) IF(DEAL_II_WITH_PETSC) DEAL_II_PICKUP_TESTS() diff --git a/tests/serialization/CMakeLists.txt b/tests/serialization/CMakeLists.txt index bd1bc1e332..f8ac3eb029 100644 --- a/tests/serialization/CMakeLists.txt +++ b/tests/serialization/CMakeLists.txt @@ -1,4 +1,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) DEAL_II_PICKUP_TESTS() diff --git a/tests/slepc/CMakeLists.txt b/tests/slepc/CMakeLists.txt index 121ac56e3b..a488e13b6f 100644 --- a/tests/slepc/CMakeLists.txt +++ b/tests/slepc/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) IF(DEAL_II_WITH_PETSC AND DEAL_II_WITH_SLEPC) DEAL_II_PICKUP_TESTS() diff --git a/tests/trilinos/CMakeLists.txt b/tests/trilinos/CMakeLists.txt index 4a33afc686..11be816935 100644 --- a/tests/trilinos/CMakeLists.txt +++ b/tests/trilinos/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) IF(DEAL_II_WITH_TRILINOS) DEAL_II_PICKUP_TESTS() diff --git a/tests/umfpack/CMakeLists.txt b/tests/umfpack/CMakeLists.txt index 538a3c32c1..5723fde32d 100644 --- a/tests/umfpack/CMakeLists.txt +++ b/tests/umfpack/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) -INCLUDE(${DEAL_II_SOURCE_DIR}/tests/setup_testsubproject.cmake) +INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) IF(DEAL_II_WITH_UMFPACK) DEAL_II_PICKUP_TESTS()