From: Matthias Maier <tamiko@43-1.org>
Date: Fri, 22 May 2020 17:34:28 +0000 (-0500)
Subject: improve automagic a bit
X-Git-Tag: v9.3.0-rc1~1575^2~3
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3b4455301f5cba5d32e1b2e7d2e0ee8f030d6db;p=dealii.git

improve automagic a bit
---

diff --git a/cmake/checks/check_01_cxx_features.cmake b/cmake/checks/check_01_cxx_features.cmake
index 116c5f023c..68aeb2696a 100644
--- a/cmake/checks/check_01_cxx_features.cmake
+++ b/cmake/checks/check_01_cxx_features.cmake
@@ -255,9 +255,13 @@ MACRO(_test_cxx14_support)
   ENDIF()
 ENDMACRO()
 
+#
+# Try to find out what we support:
+#
+
 _set_up_cmake_required()
+
 _test_cxx14_support()
-_test_cxx17_support()
 
 IF(NOT DEAL_II_HAVE_CXX14)
   MESSAGE(STATUS "C++14 support not available. Try to set -std=c++14 explicitly")
@@ -265,7 +269,6 @@ IF(NOT DEAL_II_HAVE_CXX14)
   ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "/std:c++14")
   _set_up_cmake_required()
   _test_cxx14_support()
-  _test_cxx17_support()
 ENDIF()
 
 IF(NOT DEAL_II_HAVE_CXX14)
@@ -278,6 +281,8 @@ IF(NOT DEAL_II_HAVE_CXX14)
     )
 ENDIF()
 
+_test_cxx17_support()
+
 
 ########################################################################
 #                                                                      #