]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Testsuite: Bugfix: Fix build_tests to work again with the latest changes... 706/head
authorMatthias Maier <tamiko@43-1.org>
Mon, 30 Mar 2015 09:51:05 +0000 (11:51 +0200)
committerMatthias Maier <tamiko@43-1.org>
Mon, 30 Mar 2015 10:00:50 +0000 (12:00 +0200)
 - Search for example steps at the correct location in case of setup with
   in a build directory of deal.II

 - Only exclude ".*\/doc$" from copying

tests/build_tests/CMakeLists.txt

index 189746d4c958900486164845c26c92c5f7ae59ab..c66ed702645848bb8a51d572d68c5e5e55fa5658 100644 (file)
@@ -56,7 +56,16 @@ SET(_release_steps
   step-47 step-48 step-49
   )
 
-FILE(GLOB _steps ${DEAL_II_PATH}/${DEAL_II_EXAMPLES_RELDIR}/step-*)
+#
+# Glob together all tests:
+#
+IF(DEAL_II_BUILD_DIR)
+  LIST(GET DEAL_II_INCLUDE_DIRS 1 _include_dir)
+  GET_FILENAME_COMPONENT(_binary_dir ${_include_dir} PATH)
+  FILE(GLOB _steps ${_binary_dir}/examples/step-*)
+ELSE()
+  FILE(GLOB _steps ${DEAL_II_PATH}/${DEAL_II_EXAMPLES_RELDIR}/step-*)
+ENDIF()
 
 FOREACH(_step_full ${_steps})
   GET_FILENAME_COMPONENT(_step ${_step_full} NAME)
@@ -75,7 +84,7 @@ FOREACH(_step_full ${_steps})
       FILE(GLOB _files ${_step_full}/*)
       SET(_command)
       FOREACH(_file ${_files})
-        IF(NOT _file MATCHES "/(CMakeCache.txt|CMakeFiles|doc)")
+        IF(NOT _file MATCHES "/(CMakeCache.txt|CMakeFiles|doc)$")
           LIST(APPEND _command
             COMMAND ${CMAKE_COMMAND} -E copy ${_file} ${_step_dir}
             )

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.