]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: Partially revert #6490
authorMatthias Maier <tamiko@43-1.org>
Sun, 6 May 2018 17:18:05 +0000 (12:18 -0500)
committerMatthias Maier <tamiko@43-1.org>
Sun, 6 May 2018 21:45:12 +0000 (16:45 -0500)
cmake/checks/check_01_cxx_features.cmake

index 50203fc7e591d85cd98a256d7bfa02160d32bad1..a8e85760ce231ed2b285506d31e2d57549c97b57 100644 (file)
@@ -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 <memory>
       int main()
       {
-          auto ptr = std::make_unique<int>(42);
-          return 0;
+        auto ptr = std::make_unique<int>(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(

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.