From 45cdc4b5d6ba10ba6fc65279f354494bc5960a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20M=C3=BCthing?= <muething@dune-project.org>
Date: Mon, 15 Feb 2016 16:01:26 +0100
Subject: [PATCH] [CMake][Cleanup] Consolidate include statements at beginning
of module
---
cmake/modules/CheckCXXFeatures.cmake | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/cmake/modules/CheckCXXFeatures.cmake b/cmake/modules/CheckCXXFeatures.cmake
index d1ce7cc42..5af8f9c1f 100644
--- a/cmake/modules/CheckCXXFeatures.cmake
+++ b/cmake/modules/CheckCXXFeatures.cmake
@@ -27,14 +27,15 @@
include(CMakePushCheckState)
+include(CheckCXXCompilerFlag)
+include(CheckCXXSourceCompiles)
+
# test for C++14 flags
if(NOT DISABLE_CXX_VERSION_CHECK)
# try to use compiler flag -std=c++14
- include(CheckCXXCompilerFlag)
check_cxx_compiler_flag("-std=c++14" CXX_FLAG_CXX14)
- include(CheckCXXSourceCompiles)
cmake_push_check_state()
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++14")
check_cxx_source_compiles("
@@ -60,7 +61,6 @@ else()
# try to use compiler flag -std=c++1y for older compilers
check_cxx_compiler_flag("-std=c++1y" CXX_FLAG_CXX1Y)
- include(CheckCXXSourceCompiles)
cmake_push_check_state()
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++1y")
check_cxx_source_compiles("
@@ -104,7 +104,6 @@ if(NOT DISABLE_CXX_VERSION_CHECK
endif()
# perform tests
-include(CheckCXXSourceCompiles)
# __attribute__((unused))
check_cxx_source_compiles("
--
GitLab