Skip to content
Snippets Groups Projects
Commit 45cdc4b5 authored by Steffen Müthing's avatar Steffen Müthing
Browse files

[CMake][Cleanup] Consolidate include statements at beginning of module

parent 820990a3
No related branches found
No related tags found
1 merge request!46[CMake] Rewrite C++ standard detection
...@@ -27,14 +27,15 @@ ...@@ -27,14 +27,15 @@
include(CMakePushCheckState) include(CMakePushCheckState)
include(CheckCXXCompilerFlag)
include(CheckCXXSourceCompiles)
# test for C++14 flags # test for C++14 flags
if(NOT DISABLE_CXX_VERSION_CHECK) if(NOT DISABLE_CXX_VERSION_CHECK)
# try to use compiler flag -std=c++14 # try to use compiler flag -std=c++14
include(CheckCXXCompilerFlag)
check_cxx_compiler_flag("-std=c++14" CXX_FLAG_CXX14) check_cxx_compiler_flag("-std=c++14" CXX_FLAG_CXX14)
include(CheckCXXSourceCompiles)
cmake_push_check_state() cmake_push_check_state()
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++14") set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++14")
check_cxx_source_compiles(" check_cxx_source_compiles("
...@@ -60,7 +61,6 @@ else() ...@@ -60,7 +61,6 @@ else()
# try to use compiler flag -std=c++1y for older compilers # try to use compiler flag -std=c++1y for older compilers
check_cxx_compiler_flag("-std=c++1y" CXX_FLAG_CXX1Y) check_cxx_compiler_flag("-std=c++1y" CXX_FLAG_CXX1Y)
include(CheckCXXSourceCompiles)
cmake_push_check_state() cmake_push_check_state()
set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++1y") set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++1y")
check_cxx_source_compiles(" check_cxx_source_compiles("
...@@ -104,7 +104,6 @@ if(NOT DISABLE_CXX_VERSION_CHECK ...@@ -104,7 +104,6 @@ if(NOT DISABLE_CXX_VERSION_CHECK
endif() endif()
# perform tests # perform tests
include(CheckCXXSourceCompiles)
# __attribute__((unused)) # __attribute__((unused))
check_cxx_source_compiles(" check_cxx_source_compiles("
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment