From: Timo Heister Date: Sun, 12 Jul 2015 21:33:09 +0000 (-0400) Subject: set cxx14 cmake variable correctly X-Git-Tag: v8.3.0-rc1~16^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1125%2Fhead;p=dealii.git 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. --- 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()