Skip to content

Commit 3df0c59

Browse files
committed
Don't use -Wcomma in old versions of clang
1 parent 6d1d302 commit 3df0c59

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,11 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
328328
endif()
329329

330330
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
331-
list(APPEND warning_flags -Wnewline-eof -Wunreachable-code-break -Wclass-varargs -Wcomma -Wstring-conversion)
331+
list(APPEND warning_flags -Wnewline-eof -Wunreachable-code-break -Wclass-varargs -Wstring-conversion)
332+
endif()
333+
334+
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.9)
335+
list(APPEND warning_flags -Wcomma)
332336
endif()
333337

334338
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0 AND NOT APPLE)

qrenderdoc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
168168
"QMAKE_CXXFLAGS+=-Wno-unknown-warning -Wno-implicit-fallthrough -Wno-cast-function-type -Wno-stringop-truncation\n")
169169
endif()
170170

171-
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
171+
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.9)
172172
file(APPEND
173173
${CMAKE_BINARY_DIR}/qrenderdoc/qrenderdoc_cmake.pri
174174
"QMAKE_CXXFLAGS+=-Wno-comma\n")

0 commit comments

Comments
 (0)