]> https://gitweb.dealii.org/ - dealii.git/commitdiff
set cxx14 cmake variable correctly 1125/head
authorTimo Heister <timo.heister@gmail.com>
Sun, 12 Jul 2015 21:33:09 +0000 (17:33 -0400)
committerTimo Heister <timo.heister@gmail.com>
Sun, 12 Jul 2015 21:33:09 +0000 (17:33 -0400)
The with_cxx14 flag was incorrectly set as a variable instead of settings the
cached variable. This would cause some weirdness (cached and non-cached
variables of the same name coexist). Before this patch, "DEAL_II_WITH_CXX14 =
OFF" would be printed twice in the feature section.

cmake/checks/check_01_cxx_features.cmake

index 46022e6857dd42377fa3b274f858812365e78d82..2450232e074ec9837b7d43ef7b96acbd61b0f757 100644 (file)
@@ -48,7 +48,7 @@ IF(DEAL_II_WITH_CXX14 AND DEFINED DEAL_II_WITH_CXX11 AND NOT DEAL_II_WITH_CXX11)
 ENDIF()
 
 IF(DEFINED DEAL_II_WITH_CXX11 AND NOT DEAL_II_WITH_CXX11)
-  SET(DEAL_II_WITH_CXX14 OFF)
+  SET(DEAL_II_WITH_CXX14 OFF CACHE STRING "" FORCE)
 ENDIF()
 
 

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.