]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Improve the CMake _bailout function. 4252/head
authorDavid Wells <wellsd2@rpi.edu>
Thu, 13 Apr 2017 01:48:13 +0000 (21:48 -0400)
committerDavid Wells <wellsd2@rpi.edu>
Thu, 13 Apr 2017 01:48:13 +0000 (21:48 -0400)
cmake/checks/check_01_cxx_features.cmake

index b30fd69576eb4aa8cc931de2e118c65f0e1b25f5..7ce7db8d027e495e987255e2ba0151a9cf3b6eeb 100644 (file)
@@ -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,

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.