From 0af2f6d6d2780bb375d69601a2730817ef763f7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
Date: Tue, 29 Sep 2015 08:10:41 +0200
Subject: [PATCH] [cmake] Drop 11 in filename of CheckCXX11Feature.cmake
---
cmake/modules/CMakeLists.txt | 2 +-
.../{CheckCXX11Features.cmake => CheckCXXFeatures.cmake} | 0
cmake/modules/DuneMacros.cmake | 4 ++--
cmake/modules/Makefile.am | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
rename cmake/modules/{CheckCXX11Features.cmake => CheckCXXFeatures.cmake} (100%)
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index bd841a43c..77362f51f 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -4,7 +4,7 @@ set(modules
AddParMETISFlags.cmake
AddPTScotchFlags.cmake
AddUMFPackFlags.cmake
- CheckCXX11Features.cmake
+ CheckCXXFeatures.cmake
DuneBoost.cmake
DuneCMakePackageConfigHelpers.cmake
DuneCommonMacros.cmake
diff --git a/cmake/modules/CheckCXX11Features.cmake b/cmake/modules/CheckCXXFeatures.cmake
similarity index 100%
rename from cmake/modules/CheckCXX11Features.cmake
rename to cmake/modules/CheckCXXFeatures.cmake
diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake
index a15abd36b..8b6a7812e 100644
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
@@ -619,8 +619,8 @@ macro(dune_project)
endif (APPLE)
endif(DUNE_USE_ONLY_STATIC_LIBS)
- # set required compiler flags for C++11 (former C++0x)
- include(CheckCXX11Features)
+ # check for C++ features, set compiler flags for C++14 or C++11 mode
+ include(CheckCXXFeatures)
include(DuneCxaDemangle)
diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am
index 7d63457fa..2e65265ea 100644
--- a/cmake/modules/Makefile.am
+++ b/cmake/modules/Makefile.am
@@ -4,7 +4,7 @@ MODULES = \
AddParMETISFlags.cmake \
AddPTScotchFlags.cmake \
AddUMFPackFlags.cmake \
- CheckCXX11Features.cmake \
+ CheckCXXFeatures.cmake \
DuneBoost.cmake \
DuneCMakePackageConfigHelpers.cmake \
DuneCommonMacros.cmake \
--
GitLab