Skip to content

Commit ab67abb

Browse files
committed
Try to fix protobuf-related clang warning
1 parent 9290470 commit ab67abb

File tree

1 file changed

+19
-13
lines changed

1 file changed

+19
-13
lines changed

cpp/cmake_modules/SetupCxxFlags.cmake

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -138,19 +138,7 @@ if("${BUILD_WARNING_LEVEL}" STREQUAL "CHECKIN")
138138
# https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warnings-by-compiler-version
139139
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} /W3 /wd4365 /wd4267 /wd4838")
140140
elseif("${COMPILER_FAMILY}" STREQUAL "clang")
141-
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Weverything -Wdocumentation \
142-
-Wno-c++98-compat \
143-
-Wno-c++98-compat-pedantic -Wno-deprecated -Wno-weak-vtables -Wno-padded \
144-
-Wno-comma -Wno-unused-macros -Wno-unused-parameter -Wno-unused-template -Wno-undef \
145-
-Wno-shadow -Wno-switch-enum -Wno-exit-time-destructors \
146-
-Wno-global-constructors -Wno-weak-template-vtables -Wno-undefined-reinterpret-cast \
147-
-Wno-implicit-fallthrough -Wno-unreachable-code -Wno-unreachable-code-return \
148-
-Wno-float-equal -Wno-missing-prototypes -Wno-documentation-unknown-command \
149-
-Wno-old-style-cast -Wno-covered-switch-default \
150-
-Wno-cast-align -Wno-vla-extension -Wno-shift-sign-overflow \
151-
-Wno-used-but-marked-unused -Wno-missing-variable-declarations \
152-
-Wno-gnu-zero-variadic-macro-arguments -Wno-conversion -Wno-sign-conversion \
153-
-Wno-disabled-macro-expansion -Wno-format-nonliteral -Wno-missing-noreturn")
141+
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Weverything -Wdocumentation")
154142

155143
# Version numbers where warnings are introduced
156144
if("${COMPILER_VERSION}" VERSION_GREATER "3.3")
@@ -256,6 +244,24 @@ if("${COMPILER_FAMILY}" STREQUAL "clang")
256244
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-unknown-warning-option")
257245
# Add colors when paired with ninja
258246
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")
247+
248+
# Avoid all kinds of annoying warnings
249+
set(_clang_flags "\
250+
-Wno-c++98-compat \
251+
-Wno-c++98-compat-pedantic -Wno-deprecated -Wno-weak-vtables -Wno-padded \
252+
-Wno-comma -Wno-unused-macros -Wno-unused-parameter -Wno-unused-template -Wno-undef \
253+
-Wno-shadow -Wno-switch-enum -Wno-exit-time-destructors \
254+
-Wno-global-constructors -Wno-weak-template-vtables -Wno-undefined-reinterpret-cast \
255+
-Wno-implicit-fallthrough -Wno-unreachable-code -Wno-unreachable-code-return \
256+
-Wno-float-equal -Wno-missing-prototypes -Wno-documentation-unknown-command \
257+
-Wno-old-style-cast -Wno-covered-switch-default \
258+
-Wno-cast-align -Wno-vla-extension -Wno-shift-sign-overflow \
259+
-Wno-used-but-marked-unused -Wno-missing-variable-declarations \
260+
-Wno-gnu-zero-variadic-macro-arguments -Wno-conversion -Wno-sign-conversion \
261+
-Wno-disabled-macro-expansion -Wno-format-nonliteral -Wno-missing-noreturn")
262+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_clang_flags}")
263+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_clang_flags}")
264+
259265
endif()
260266

261267
# if build warning flags is set, add to CXX_COMMON_FLAGS

0 commit comments

Comments
 (0)