From 7029cf8ae659546e57b10147e168362b460cd66e Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Sun, 12 Jul 2015 17:33:09 -0400 Subject: [PATCH] set cxx14 cmake variable correctly 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/checks/check_01_cxx_features.cmake b/cmake/checks/check_01_cxx_features.cmake index 46022e6857..2450232e07 100644 --- a/cmake/checks/check_01_cxx_features.cmake +++ b/cmake/checks/check_01_cxx_features.cmake @@ -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() -- 2.39.5