From: Matthias Maier <tamiko@43-1.org>
Date: Sun, 6 May 2018 17:18:05 +0000 (-0500)
Subject: CMake: Partially revert #6490
X-Git-Tag: v9.1.0-rc1~1201^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76137a0bd65ae6bd8bcad5a7ac350b9ea241e24d;p=dealii.git

CMake: Partially revert #6490
---

diff --git a/cmake/checks/check_01_cxx_features.cmake b/cmake/checks/check_01_cxx_features.cmake
index f5581563f0..7a7680aef2 100644
--- a/cmake/checks/check_01_cxx_features.cmake
+++ b/cmake/checks/check_01_cxx_features.cmake
@@ -180,18 +180,15 @@ IF(NOT DEFINED DEAL_II_WITH_CXX14 OR DEAL_II_WITH_CXX14)
     PUSH_CMAKE_REQUIRED("${DEAL_II_CXX_VERSION_FLAG}")
 
     #
-    # We assume std::max has a constexpr version and make_unique works
+    # We assume std::make_unique works
     #
     CHECK_CXX_SOURCE_COMPILES(
       "
       #include <memory>
-      #include <cmath>
 
       int main()
       {
         auto ptr = std::make_unique<int>(42);
-        constexpr int bob = std::max(sizeof(ptr), sizeof(char[8]));
-        int bobs[bob];
         return 0;
       }
       "
@@ -199,7 +196,7 @@ IF(NOT DEFINED DEAL_II_WITH_CXX14 OR DEAL_II_WITH_CXX14)
 
     #
     # 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(