From e6b42b4ff38d3b822de13e2a4c1e005dc13f1296 Mon Sep 17 00:00:00 2001 From: David Wells Date: Wed, 12 Apr 2017 21:48:13 -0400 Subject: [PATCH] Improve the CMake _bailout function. --- cmake/checks/check_01_cxx_features.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/checks/check_01_cxx_features.cmake b/cmake/checks/check_01_cxx_features.cmake index b30fd69576..7ce7db8d02 100644 --- a/cmake/checks/check_01_cxx_features.cmake +++ b/cmake/checks/check_01_cxx_features.cmake @@ -299,7 +299,7 @@ SET(FEATURE_CXX14_PROCESSED TRUE) # DEAL_II_WITH_CXX14) but support is not available due to above tests # -MACRO(_bailout _version) +MACRO(_bailout _version _symbolic) IF(DEAL_II_WITH_CXX${_version} AND NOT DEAL_II_HAVE_CXX${_version}) MESSAGE(FATAL_ERROR "\n" "C++${_version} support was requested (DEAL_II_WITH_CXX${_version}=${DEAL_II_WITH_CXX${_version}}) but is not " @@ -307,14 +307,14 @@ MACRO(_bailout _version) "Please disable C++${_version} support, i.e. configure with\n" " -DDEAL_II_WITH_CXX${_version}=FALSE,\n" "or use a different compiler, instead. (If the compiler flag for C++${_version} " - "support differs from \"-std=c++0x\" or \"-std=c++${_version}\", a suitable " - "compiler flag has to be specified manually via\n" + "support differs from \"-std=c++${_symbolic}\" or \"-std=c++${_version}\", " + "a suitable compiler flag has to be specified manually via\n" " -DDEAL_II_CXX_VERSION_FLAG=\"...\"\n\n" ) ENDIF() ENDMACRO() -_bailout("14") +_bailout("14" "1y") # # Some compilers (notably GCC6 and up) default to C++14 (more exactly, GNU++14, -- 2.39.5