Skip to content

Commit 18689e8

Browse files
authored
Isolate Clang-only CMake flags (#15811)
1 parent c69d567 commit 18689e8

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

‎dependencies/O2CompileFlags.cmake‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
108108
WARNINGS ${O2_NEW_COMPILER_WARNINGS_NO_ERROR})
109109
endif()
110110

111-
string(JOIN " " CMAKE_C_WARNINGS "-Wno-unknown-warning-option" "-Wno-vla-cxx-extension" ${O2_C_ENABLED_WARNINGS} ${O2_C_ENABLED_WARNINGS_NO_ERROR} ${O2_NEW_COMPILER_NO_ERROR_FLAGS})
112-
string(JOIN " " CMAKE_CXX_WARNINGS "-Wno-unknown-warning-option" "-Wno-vla-cxx-extension" ${O2_CXX_ENABLED_WARNINGS} ${O2_CXX_ENABLED_WARNINGS_NO_ERROR} ${O2_NEW_COMPILER_NO_ERROR_FLAGS})
111+
string(JOIN " " CMAKE_C_WARNINGS ${O2_C_ENABLED_WARNINGS} ${O2_C_ENABLED_WARNINGS_NO_ERROR} ${O2_NEW_COMPILER_NO_ERROR_FLAGS})
112+
string(JOIN " " CMAKE_CXX_WARNINGS ${O2_CXX_ENABLED_WARNINGS} ${O2_CXX_ENABLED_WARNINGS_NO_ERROR} ${O2_NEW_COMPILER_NO_ERROR_FLAGS})
113+
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
114+
string(APPEND CMAKE_C_WARNINGS " -Wno-unknown-warning-option -Wno-vla-cxx-extension")
115+
string(APPEND CMAKE_CXX_WARNINGS " -Wno-unknown-warning-option -Wno-vla-cxx-extension")
116+
endif()
113117

114118
string(REGEX MATCH "-O[0-9]+" CMAKE_FLAGS_OPT_VALUE "${CMAKE_CXX_FLAGS}")
115119
if(NOT CMAKE_FLAGS_OPT_VALUE OR CMAKE_FLAGS_OPT_VALUE STREQUAL "-O0" OR CMAKE_FLAGS_OPT_VALUE STREQUAL "-O1")

0 commit comments

Comments
 (0)