diff options
| author | Tor Egge <Tor.Egge@online.no> | 2023-06-17 15:36:41 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2023-06-17 15:36:41 +0200 |
| commit | 21f483b3917d116b4798cc235828f841fa196207 (patch) | |
| tree | 318ed9901b82e1da2a3b776373542af6d39b85d6 /build_settings.cmake | |
| parent | 056b844af08214c90ec5226afac58824a828f255 (diff) | |
Set CMAKE_CXX_STANDARD to 20.
Diffstat (limited to 'build_settings.cmake')
| -rw-r--r-- | build_settings.cmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index 597f2cd42ae..63535062c9b 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -108,7 +108,7 @@ if (VESPA_USE_SANITIZER) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-sanitize=vptr") endif() endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} ${CXX_SPECIFIC_WARN_OPTS} -std=c++2a -fdiagnostics-color=auto ${EXTRA_CXX_FLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} ${CXX_SPECIFIC_WARN_OPTS} -fdiagnostics-color=auto ${EXTRA_CXX_FLAGS}") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ") else() @@ -147,9 +147,8 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic" ) message("-- CMAKE_SHARED_LINKER_FLAGS is ${CMAKE_SHARED_LINKER_FLAGS}") -# Use C++ 17 -# TODO renable when cmake 3.8 is out. -# set(CMAKE_CXX_STANDARD 17) +# Use C++ 20 +set(CMAKE_CXX_STANDARD 20) # Always build shared libs if not explicitly specified set(BUILD_SHARED_LIBS ON) |