From c3b4455301f5cba5d32e1b2e7d2e0ee8f030d6db Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Fri, 22 May 2020 12:34:28 -0500 Subject: [PATCH] improve automagic a bit --- cmake/checks/check_01_cxx_features.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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() + ######################################################################## # # -- 2.39.5