From f95968a31392110ff81d55ce91c0d16a71af0059 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 30 Mar 2015 11:51:05 +0200 Subject: [PATCH] Testsuite: Bugfix: Fix build_tests to work again with the latest changes... - 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 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/build_tests/CMakeLists.txt b/tests/build_tests/CMakeLists.txt index 189746d4c9..c66ed70264 100644 --- a/tests/build_tests/CMakeLists.txt +++ b/tests/build_tests/CMakeLists.txt @@ -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} ) -- 2.39.5