From 9b9a4c3128e7b39e8697f33611cfda92e216a7ef Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sun, 6 May 2018 12:18:05 -0500 Subject: [PATCH] CMake: Partially revert #6490 --- cmake/checks/check_01_cxx_features.cmake | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cmake/checks/check_01_cxx_features.cmake b/cmake/checks/check_01_cxx_features.cmake index 50203fc7e5..a8e85760ce 100644 --- a/cmake/checks/check_01_cxx_features.cmake +++ b/cmake/checks/check_01_cxx_features.cmake @@ -180,23 +180,22 @@ IF(NOT DEFINED DEAL_II_WITH_CXX14 OR DEAL_II_WITH_CXX14) PUSH_CMAKE_REQUIRED("${DEAL_II_CXX_VERSION_FLAG}") # - # This test does not guarantee full C++14 support, but virtually every - # compiler with some C++14 support implements this. + # We assume std::make_unique works # CHECK_CXX_SOURCE_COMPILES( " #include int main() { - auto ptr = std::make_unique(42); - return 0; + auto ptr = std::make_unique(42); + return 0; } " DEAL_II_HAVE_CXX14_MAKE_UNIQUE) # # This test checks constexpr std::max/min support. Unfortunately, - # gcc-4.9 does claim to support C++14 but fails to provide a constexpr + # gcc-4.9 claims to support C++14 but fails to provide a constexpr # compatible std::max/min. Disable C++14 support in this case. # CHECK_CXX_SOURCE_COMPILES( -- 2.39.5