External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop setting CMAKE_CXX_STANDARD explicitly.

Browse Source 
This allows the compiler default to be used which fixes #1237 without
explicitly checking for a specific compiler variant.
This commit is contained in:
Daan De Meyer 2019-07-19 10:02:54 +02:00
parent 6a497e1d06
commit 4668460d10
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
support/cmake/cxx14.cmake
View File

@ -3,10 +3,11 @@
include(CheckCXXSourceCompiles) include(CheckCXXSourceCompiles)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
if (NOT CMAKE_CXX_STANDARD) if (CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 11)
endif()
message(STATUS "CXX_STANDARD: ${CMAKE_CXX_STANDARD}") message(STATUS "CXX_STANDARD: ${CMAKE_CXX_STANDARD}")
else()
message(STATUS "CXX_STANDARD: Default")
endif()
if (CMAKE_CXX_STANDARD EQUAL 20) if (CMAKE_CXX_STANDARD EQUAL 20)
check_cxx_compiler_flag(-std=c++20 has_std_20_flag) check_cxx_compiler_flag(-std=c++20 has_std_20_flag)
@ -35,7 +36,7 @@ elseif (CMAKE_CXX_STANDARD EQUAL 14)
elseif (has_std_1y_flag) elseif (has_std_1y_flag)
set(CXX_STANDARD_FLAG -std=c++1y) set(CXX_STANDARD_FLAG -std=c++1y)
endif () endif ()
elseif (CMAKE_CXX_STANDARD EQUAL 11) else ()
check_cxx_compiler_flag(-std=c++11 has_std_11_flag) check_cxx_compiler_flag(-std=c++11 has_std_11_flag)
check_cxx_compiler_flag(-std=c++0x has_std_0x_flag) check_cxx_compiler_flag(-std=c++0x has_std_0x_flag)