Use C++17 as maximum standard for GCC
GCC 9 has incomplete and buggy implementation of -std=c++2a. Rollback to c++17.
This commit is contained in:
parent
7ffe89803e
commit
67cf2a5abd
1 changed files with 7 additions and 2 deletions
|
|
@ -4,6 +4,11 @@
|
||||||
# For license and copyright information please follow this link:
|
# For license and copyright information please follow this link:
|
||||||
# https://github.com/desktop-app/legal/blob/master/LEGAL
|
# https://github.com/desktop-app/legal/blob/master/LEGAL
|
||||||
|
|
||||||
|
set(MAXIMUM_CXX_STANDARD cxx_std_20)
|
||||||
|
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||||
|
set(MAXIMUM_CXX_STANDARD cxx_std_17)
|
||||||
|
endif()
|
||||||
|
|
||||||
function(init_target_folder target_name folder_name)
|
function(init_target_folder target_name folder_name)
|
||||||
if (NOT "${folder_name}" STREQUAL "")
|
if (NOT "${folder_name}" STREQUAL "")
|
||||||
set_target_properties(${target_name} PROPERTIES FOLDER ${folder_name})
|
set_target_properties(${target_name} PROPERTIES FOLDER ${folder_name})
|
||||||
|
|
@ -15,11 +20,11 @@ function(init_target target_name) # init_target(my_target folder_name)
|
||||||
if (${ARGV1} STREQUAL cxx_std_14 OR ${ARGV1} STREQUAL cxx_std_11)
|
if (${ARGV1} STREQUAL cxx_std_14 OR ${ARGV1} STREQUAL cxx_std_11)
|
||||||
target_compile_features(${target_name} PUBLIC ${ARGV1})
|
target_compile_features(${target_name} PUBLIC ${ARGV1})
|
||||||
else()
|
else()
|
||||||
target_compile_features(${target_name} PUBLIC cxx_std_20)
|
target_compile_features(${target_name} PUBLIC ${MAXIMUM_CXX_STANDARD})
|
||||||
init_target_folder(${target_name} ${ARGV1})
|
init_target_folder(${target_name} ${ARGV1})
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
target_compile_features(${target_name} PUBLIC cxx_std_20)
|
target_compile_features(${target_name} PUBLIC ${MAXIMUM_CXX_STANDARD})
|
||||||
endif()
|
endif()
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set_target_properties(${target_name} PROPERTIES
|
set_target_properties(${target_name} PROPERTIES
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue