]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Cleanup CMake script files
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 13 Sep 2013 15:16:26 +0000 (15:16 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 13 Sep 2013 15:16:26 +0000 (15:16 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30689 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/cmake/setup_testsuite.cmake [new file with mode: 0644]
tests/CMakeLists.txt
tests/all-headers/CMakeLists.txt

diff --git a/deal.II/cmake/setup_testsuite.cmake b/deal.II/cmake/setup_testsuite.cmake
new file mode 100644 (file)
index 0000000..2e9300f
--- /dev/null
@@ -0,0 +1,70 @@
+## ---------------------------------------------------------------------
+## $Id$
+##
+## Copyright (C) 2013 by the deal.II authors
+##
+## This file is part of the deal.II library.
+##
+## The deal.II library is free software; you can use it, redistribute
+## it, and/or modify it under the terms of the GNU Lesser General
+## Public License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+## The full text of the license can be found in the file LICENSE at
+## the top level of the deal.II distribution.
+##
+## ---------------------------------------------------------------------
+
+#
+# Setup testsuite:
+#
+# TODO: Describe and document the following:
+#
+# TEST_DIFF
+# TEST_TIME_LIMIT
+# NUMDIFF_DIR
+#
+
+#
+# We need perl for the testsuite:
+#
+
+FIND_PACKAGE(Perl)
+IF(NOT PERL_FOUND)
+  MESSAGE(FATAL_ERROR
+    "Could not find a perl installation which is required for running the test suite"
+    )
+ENDIF()
+
+#
+# And a diff tool, preferably numdiff:
+#
+
+FIND_PROGRAM(NUMDIFF_EXECUTABLE
+  NAMES numdiff
+  HINTS ${NUMDIFF_DIR}
+  PATH_SUFFIXES bin
+  )
+FIND_PROGRAM(DIFF_EXECUTABLE
+  NAMES diff
+  )
+IF( NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND"
+    AND DIFF_EXECUTABLE MATCHES "-NOTFOUND" )
+  MESSAGE(FATAL_ERROR
+    "Could not find diff or numdiff. One of those are required for running the testsuite."
+    )
+ENDIF()
+
+IF(NOT NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND")
+  SET_IF_EMPTY(TEST_DIFF ${NUMDIFF_EXECUTABLE} -a 1e-6 -q -s ' \t\n:')
+ELSE()
+  SET_IF_EMPTY(TEST_DIFF ${DIFF_EXECUTABLE})
+ENDIF()
+
+MARK_AS_ADVANCED(DIFF_EXECUTABLE NUMDIFF_EXECUTABLE)
+
+#
+# Set a default time limit of 60 seconds:
+#
+
+SET_IF_EMPTY(TEST_TIME_LIMIT 120)
+
index ba41e5bd9c6bf0c43fb8d320f0632e6b742b7745..a7e3ef36017027455f529f94dd6d48ba2498613e 100644 (file)
 #
 # Setup and run the testsuite:
 #
-# TODO: Describe and document the following:
-# TEST_DIFF
-# TEST_TIME_LIMIT
-# NUMDIFF_DIR
-#
-
-#
-# We need perl for the testsuite:
-#
-FIND_PACKAGE(Perl)
-IF(NOT PERL_FOUND)
-  MESSAGE(FATAL_ERROR
-    "Could not find a perl installation which is required for running the test suite"
-    )
-ENDIF()
-
-#
-# And a diff tool, preferably numdiff:
-#
-FIND_PROGRAM(NUMDIFF_EXECUTABLE
-  NAMES numdiff
-  HINTS ${NUMDIFF_DIR}
-  PATH_SUFFIXES bin
-  )
-FIND_PROGRAM(DIFF_EXECUTABLE
-  NAMES diff
-  )
-IF( NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND"
-    AND DIFF_EXECUTABLE MATCHES "-NOTFOUND" )
-  MESSAGE(FATAL_ERROR
-    "Could not find diff or numdiff. One of those are required for running the testsuite."
-    )
-ENDIF()
-
-IF(NOT NUMDIFF_EXECUTABLE MATCHES "-NOTFOUND")
-  SET_IF_EMPTY(TEST_DIFF ${NUMDIFF_EXECUTABLE} -a 1e-6 -q -s ' \t\n:')
-ELSE()
-  SET_IF_EMPTY(TEST_DIFF ${DIFF_EXECUTABLE})
-ENDIF()
-
-MARK_AS_ADVANCED(DIFF_EXECUTABLE NUMDIFF_EXECUTABLE)
-
-#
-# Set a default time limit of 60 seconds:
-#
-SET_IF_EMPTY(TEST_TIME_LIMIT 120)
 
+INCLUDE(setup_testsuite)
 
 MESSAGE(STATUS "Proceed to test definitions")
 
@@ -74,39 +29,42 @@ ADD_SUBDIRECTORY(base)
 ADD_SUBDIRECTORY(bits)
 ADD_SUBDIRECTORY(codim_one)
 ADD_SUBDIRECTORY(deal.II)
+
+IF(DEAL_II_WITH_P4EST)
+  ADD_SUBDIRECTORY(distributed_grids)
+ENDIF()
+
 #ADD_SUBDIRECTORY(fail) -- the good old failing tests
+
 ADD_SUBDIRECTORY(fe)
 ADD_SUBDIRECTORY(grid)
 ADD_SUBDIRECTORY(hp)
 ADD_SUBDIRECTORY(integrators)
 ADD_SUBDIRECTORY(lac)
-ADD_SUBDIRECTORY(matrix_free)
-ADD_SUBDIRECTORY(multigrid)
-ADD_SUBDIRECTORY(serialization)
-
-# These two are a little bit special
-#benchmarks
-#mesh_converter
-
-#gla - WITH_MPI, ?? WITH_P4EST ??
-#mpi - WITH_MPI
 
 IF(DEAL_II_WITH_LAPACK)
   ADD_SUBDIRECTORY(lapack)
 ENDIF()
 
+ADD_SUBDIRECTORY(matrix_free)
+
 IF(DEAL_II_WITH_METIS)
   ADD_SUBDIRECTORY(metis)
 ENDIF()
 
-IF(DEAL_II_WITH_P4EST)
-  ADD_SUBDIRECTORY(distributed_grids)
+IF(DEAL_II_WITH_MPI AND DEAL_II_WITH_P4EST)
+  ADD_SUBDIRECTORY(gla)
+  ADD_SUBDIRECTORY(mpi)
 ENDIF()
 
+ADD_SUBDIRECTORY(multigrid)
+
 IF(DEAL_II_WITH_PETSC)
   ADD_SUBDIRECTORY(petsc)
 ENDIF()
 
+ADD_SUBDIRECTORY(serialization)
+
 IF(DEAL_II_WITH_SLEPC)
   ADD_SUBDIRECTORY(slepc)
 ENDIF()
@@ -118,3 +76,4 @@ ENDIF()
 IF(DEAL_II_WITH_UMFPACK)
   ADD_SUBDIRECTORY(umfpack)
 ENDIF()
+
index 48c38fcce777178b2af6582228d4ffe028a9a77b..5ab714797b67d2506d5a3df697943f63763f6a3e 100644 (file)
@@ -1,3 +1,19 @@
+## ---------------------------------------------------------------------
+## $Id$
+##
+## Copyright (C) 2013 by the deal.II authors
+##
+## This file is part of the deal.II library.
+##
+## The deal.II library is free software; you can use it, redistribute
+## it, and/or modify it under the terms of the GNU Lesser General
+## Public License as published by the Free Software Foundation; either
+## version 2.1 of the License, or (at your option) any later version.
+## The full text of the license can be found in the file LICENSE at
+## the top level of the deal.II distribution.
+##
+## ---------------------------------------------------------------------
+
 #
 # Header tests are special:
 #
@@ -5,6 +21,7 @@
 # to compile a simple worker (test_header.cc) that only includes the given
 # header file. We omit linking to safe some time.
 #
+
 SET(_category all-headers)
 
 FILE(GLOB_RECURSE _header

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.