From d5e8d44ec823c40e3a88254b6470bd3ba9f1787c Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 9 Dec 2014 13:57:35 +0100 Subject: [PATCH] Cleanup DEAL_II_MSVC testsuite handling --- CMakeLists.txt | 11 ++++++----- tests/CMakeLists.txt | 13 +++++-------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24fd216a41..8bfac59aee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,11 +155,12 @@ ADD_SUBDIRECTORY(cmake/config) # has to be included after source ADD_SUBDIRECTORY(contrib) # has to be included after source ADD_SUBDIRECTORY(examples) -IF(DEAL_II_HAVE_TESTS_DIRECTORY) - # Turn this off for MSVC. The commands 'test', '> /dev/null', 'rm' are Linux shell commands not available on Windows. - IF(NOT DEAL_II_MSVC) - ADD_SUBDIRECTORY(tests) - ENDIF() +# +# Do not configure testsuite on Windows targets because posix shell and +# commands like 'test', '> /dev/null', 'rm', etc. are not available +# +IF(DEAL_II_HAVE_TESTS_DIRECTORY AND NOT DEAL_II_MSVC) + ADD_SUBDIRECTORY(tests) ENDIF() # diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 103e90ab39..67678d6fab 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -75,14 +75,11 @@ ADD_CUSTOM_TARGET(setup_tests) # Remove all tests: ADD_CUSTOM_TARGET(prune_tests) -# Turn this off for MSVC as none of the sub-targets is used for MSVC (see below). -IF(NOT DEAL_II_MSVC) - # Regenerate tests (run "make rebuild_cache" in subprojects): - ADD_CUSTOM_TARGET(regen_tests) - - # Regenerate tests (run "make clean" in subprojects): - ADD_CUSTOM_TARGET(clean_tests) -ENDIF() +# Regenerate tests (run "make rebuild_cache" in subprojects): +ADD_CUSTOM_TARGET(regen_tests) + +# Regenerate tests (run "make clean" in subprojects): +ADD_CUSTOM_TARGET(clean_tests) FOREACH(_category ${_categories}) SET(_category_dir ${CMAKE_SOURCE_DIR}/tests/${_category}) -- 2.39.5