diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-12-03 08:27:24 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-12-03 08:27:24 +0000 |
| commit | 2ef87e930b278df59dcf7509fce213e4b3120f5b (patch) | |
| tree | 0eb7185c93543d2e3685db3cf7a9254e78e88a6e /build_settings.cmake | |
| parent | a30f94af8019b0316d893fcc45b7f84df6ba068d (diff) | |
Enable c++2a
Diffstat (limited to 'build_settings.cmake')
| -rw-r--r-- | build_settings.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index 3a4708bd10d..414d73b2013 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -78,10 +78,11 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O3 -fno-omit-frame-pointer ${C_WARN_OPTS if (VESPA_USE_SANITIZER) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${VESPA_USE_SANITIZER}") endif() +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} ${CXX_SPECIFIC_WARN_OPTS} -std=c++2a -fdiagnostics-color=auto ${EXTRA_CXX_FLAGS}") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} ${CXX_SPECIFIC_WARN_OPTS} -std=c++1z -fdiagnostics-color=auto ${EXTRA_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ") else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS} ${CXX_SPECIFIC_WARN_OPTS} -std=c++1z -fvisibility-inlines-hidden -fdiagnostics-color=auto ${EXTRA_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden ") endif() # Linker flags |