diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-12-03 11:58:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-03 11:58:12 +0100 |
| commit | a335a2b692ebaf1bb77182aeec45023c6b56d2a7 (patch) | |
| tree | 2ec1fe232f1731220ce6fac2eeff3f5c81969ac9 | |
| parent | 245bb24179b5e5e2872e275140d17ba0cacfa448 (diff) | |
| parent | 2ef87e930b278df59dcf7509fce213e4b3120f5b (diff) | |
Merge pull request #15626 from vespa-engine/balder/enable-c++2a
Enable c++2a
| -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 |