Use C++17 locally, C++14 on CI (#2597)
Co-authored-by: Russel Waters <russel@nano.org> Co-authored-by: Russel Waters <vaelstrom@gmail.com>
This commit is contained in:
parent
73b12c30bc
commit
20a13c829d
1 changed files with 5 additions and 1 deletions
|
@ -170,7 +170,11 @@ set(CMAKE_C_STANDARD 11)
|
|||
set(CMAKE_C_STANDARD_REQUIRED ON)
|
||||
#set(CMAKE_C_EXTENSIONS OFF)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
set(NANO_SUPPORTED_CPP_STANDARD "17" CACHE STRING "Supported C++ standard (14 or 17)")
|
||||
if (CI_BUILD OR CI_TEST)
|
||||
set(NANO_SUPPORTED_CPP_STANDARD "14")
|
||||
endif()
|
||||
set(CMAKE_CXX_STANDARD ${NANO_SUPPORTED_CPP_STANDARD})
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
#set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue