diff options
author | Pino Toscano <pino@kde.org> | 2021-12-21 19:38:32 +0100 |
---|---|---|
committer | Pino Toscano <pino@kde.org> | 2021-12-21 19:38:32 +0100 |
commit | 1c8134dac659d60e201e112bfb48ccda7c637dd0 (patch) | |
tree | 84ecf0612ac53bad60e78932bf29cc893b77aeda | |
parent | 0ee1ed9ff1bd4cf2a49e1232696747f1898e2987 (diff) | |
parent | e15334b569da57a005ec9fbd2cf0b683bdc3de4c (diff) |
Merge remote-tracking branch 'origin/1.10'
-rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e0547720..f8459c54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,7 @@ if(MSVC) # disable trigger-happy warnings from Clang/LLVM headers set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267 /wd4244 /wd4291 /wd4800 /wd4141 /wd4146 /wd4251") elseif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -fno-exceptions -fno-rtti") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings -fno-exceptions -fno-rtti") endif() set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-flat_namespace -Wl,-undefined -Wl,suppress") |