]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Testsuite: Refactor tests/CMakeLists.txt
authorMatthias Maier <tamiko@43-1.org>
Sat, 28 Mar 2015 22:24:47 +0000 (23:24 +0100)
committerMatthias Maier <tamiko@43-1.org>
Sun, 29 Mar 2015 11:06:38 +0000 (13:06 +0200)
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).

32 files changed:
CMakeLists.txt
tests/CMakeLists.txt
tests/a-framework/CMakeLists.txt
tests/algorithms/CMakeLists.txt
tests/all-headers/CMakeLists.txt
tests/aniso/CMakeLists.txt
tests/arpack/CMakeLists.txt
tests/base/CMakeLists.txt
tests/bits/CMakeLists.txt
tests/build_tests/CMakeLists.txt
tests/codim_one/CMakeLists.txt
tests/deal.II/CMakeLists.txt
tests/distributed_grids/CMakeLists.txt
tests/fe/CMakeLists.txt
tests/gla/CMakeLists.txt
tests/grid/CMakeLists.txt
tests/hp/CMakeLists.txt
tests/integrators/CMakeLists.txt
tests/lac/CMakeLists.txt
tests/lapack/CMakeLists.txt
tests/manifold/CMakeLists.txt
tests/matrix_free/CMakeLists.txt
tests/mesh_converter/CMakeLists.txt
tests/metis/CMakeLists.txt
tests/mpi/CMakeLists.txt
tests/multigrid/CMakeLists.txt
tests/opencascade/CMakeLists.txt
tests/petsc/CMakeLists.txt
tests/serialization/CMakeLists.txt
tests/slepc/CMakeLists.txt
tests/trilinos/CMakeLists.txt
tests/umfpack/CMakeLists.txt

index 07032657f4cd03b48855a0a1adcb70223cf3e5ba..56a4f749f98c52f75b324d5428c0bae6be05b896 100644 (file)
@@ -50,7 +50,6 @@ IF(POLICY CMP0037)
   CMAKE_POLICY(SET CMP0037 OLD)
 ENDIF()
 
-
 LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
 
 #
index d611c3db6f325446b4efe842c49264a6f061cf27..ef3b2dc8423989fe8821a982ad54185570aa2393 100644 (file)
@@ -14,7 +14,7 @@
 ## ---------------------------------------------------------------------
 
 #
-# Setup the testsuite.
+# Set up the testsuite.
 #
 # We define toplevel targets:
 #    setup_tests    - set up testsuite subprojects
 #    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()
index a86dc6e63914b1632b9f40a8b6c64bdeaf3247f5..96fa5ad7f3a7dfc476c5e1c714f048195d3fc86d 100644 (file)
@@ -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()
 
index bd1bc1e3323e9e70b7b1b8707bc7589b1559fa46..f8ac3eb0293f527a61a77021830aa874261d7f4f 100644 (file)
@@ -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()
index b63e1a3f9c6c3d1e4038dbd4926f0ce33d8079d3..eda1e784673ffb8791cc461fb99a4ca2233956f3 100644 (file)
@@ -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})
index bd1bc1e3323e9e70b7b1b8707bc7589b1559fa46..f8ac3eb0293f527a61a77021830aa874261d7f4f 100644 (file)
@@ -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()
index 7b57c1e4e8e771ef7e62528482cc8aa7dcfd8d1e..077c200af3f145bbc34a579013087cde7299431c 100644 (file)
@@ -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()
index bd1bc1e3323e9e70b7b1b8707bc7589b1559fa46..f8ac3eb0293f527a61a77021830aa874261d7f4f 100644 (file)
@@ -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()
index bd1bc1e3323e9e70b7b1b8707bc7589b1559fa46..f8ac3eb0293f527a61a77021830aa874261d7f4f 100644 (file)
@@ -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()
index 33922a000e6595da46c3f8f6714adb0f3d99c181..189746d4c958900486164845c26c92c5f7ae59ab 100644 (file)
@@ -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)
index bd1bc1e3323e9e70b7b1b8707bc7589b1559fa46..f8ac3eb0293f527a61a77021830aa874261d7f4f 100644 (file)
@@ -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()
index bd1bc1e3323e9e70b7b1b8707bc7589b1559fa46..f8ac3eb0293f527a61a77021830aa874261d7f4f 100644 (file)
@@ -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()
index 4c1a02d789b42bd66cdf2e3eb1e03c3d72fa6180..35240e341a63716218ca885b727aadbf61d4d6b9 100644 (file)
@@ -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()
index bd1bc1e3323e9e70b7b1b8707bc7589b1559fa46..f8ac3eb0293f527a61a77021830aa874261d7f4f 100644 (file)
@@ -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()
index 3f784ff97fb63adccd165a93f103e2104ec4738a..77e5d6b9743a5d3e7bbaa5d42bb2ac1b16887156 100644 (file)
@@ -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()
index bd1bc1e3323e9e70b7b1b8707bc7589b1559fa46..f8ac3eb0293f527a61a77021830aa874261d7f4f 100644 (file)
@@ -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()
index bd1bc1e3323e9e70b7b1b8707bc7589b1559fa46..f8ac3eb0293f527a61a77021830aa874261d7f4f 100644 (file)
@@ -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()
index bd1bc1e3323e9e70b7b1b8707bc7589b1559fa46..f8ac3eb0293f527a61a77021830aa874261d7f4f 100644 (file)
@@ -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()
index bd1bc1e3323e9e70b7b1b8707bc7589b1559fa46..f8ac3eb0293f527a61a77021830aa874261d7f4f 100644 (file)
@@ -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()
index a57b08ece7cf3e272b0d22eaacfb8f43abb2de76..6f5b1fd5bd5e75f0c4e42390b98a3c9eb39a21e2 100644 (file)
@@ -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()
index 616b94a3b4a4a3ba85cde7129b9dfcdb06c179b6..368fc54c3e74adeaddfa777991eea10e7de1ce5e 100644 (file)
@@ -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()
index bd1bc1e3323e9e70b7b1b8707bc7589b1559fa46..f8ac3eb0293f527a61a77021830aa874261d7f4f 100644 (file)
@@ -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()
index e6066797448c548f8ff1c8e6790a67a8396f12af..7917e44d3a749a3d29962ba826c2ac76d3343f09 100644 (file)
@@ -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)
 
 #
index 37c3ae108d5a0a5a70999dfe8383d94469a6c229..2f8188fd920d4841c51705fb9a287a6c5ea3a50a 100644 (file)
@@ -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()
index bd0697dbb7c1252685b94dbdea4273a0c00ae8c1..ca793a01d5b88f5d4c00865b169e86dd6797d2e9 100644 (file)
@@ -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()
index bd1bc1e3323e9e70b7b1b8707bc7589b1559fa46..f8ac3eb0293f527a61a77021830aa874261d7f4f 100644 (file)
@@ -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()
index e586a5e3651a09580d14889fa083a6b054829d19..65ccd6dfb822376b917cb11f1d0335648253cd77 100644 (file)
@@ -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()
index e04dc4b2d63e76f372af270fd580a55a1455a291..3ad3bbefa3ac40b3e0ef3eeaa2d27f9f861253e0 100644 (file)
@@ -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()
index bd1bc1e3323e9e70b7b1b8707bc7589b1559fa46..f8ac3eb0293f527a61a77021830aa874261d7f4f 100644 (file)
@@ -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()
index 121ac56e3b4bcee5a1538cbd31298127901cf056..a488e13b6fefda47831ea01684bb4d7bd023baad 100644 (file)
@@ -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()
index 4a33afc68670325a1728139965b5c56f6c30fb9b..11be8169352d87a0f7b9fbbe1cb236cba7f0e48a 100644 (file)
@@ -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()
index 538a3c32c1f8ecf9f25c1e053107de287c492738..5723fde32d41fd384060ff78ff98548f58d249a2 100644 (file)
@@ -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()

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.