Cleanup DEAL_II_MSVC testsuite handling

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24fd216a4163de714e26e4f0c6004766546ec096..8bfac59aeeb301d026ebf3108a3ac306807650bf 100644 (file)
--- 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 103e90ab39f4a8adb55be65ef264ed236dcfa03a..67678d6fabb58bc42161f663506549ca46a628da 100644 (file)
--- 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})