From c3723d089c5585ffc642e8e65cd20b7a38e9eace Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Wed, 3 Dec 2014 06:54:53 -0600 Subject: [PATCH] Patch by Lukas Korous: Disable the testsuite for Microsoft Visual Studio because the testsuite uses Unix shell commands. --- CMakeLists.txt | 5 ++++- tests/CMakeLists.txt | 13 ++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12a7428d7e..24fd216a41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,7 +156,10 @@ ADD_SUBDIRECTORY(contrib) # has to be included after source ADD_SUBDIRECTORY(examples) IF(DEAL_II_HAVE_TESTS_DIRECTORY) - ADD_SUBDIRECTORY(tests) + # 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() ENDIF() # diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 67678d6fab..103e90ab39 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -75,11 +75,14 @@ ADD_CUSTOM_TARGET(setup_tests) # Remove all tests: ADD_CUSTOM_TARGET(prune_tests) -# 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) +# 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() FOREACH(_category ${_categories}) SET(_category_dir ${CMAKE_SOURCE_DIR}/tests/${_category}) -- 2.39.5