summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-01-14 18:03:58 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-01-18 03:37:24 +0000
commitee64bcd385acf8dc0dd3c1b2dd69f3416ee34f83 (patch)
tree23857c9aede2d9b671241f663a221d9d72a48d15 /cmake
parent2ed7c64dd92eedeccaae6ff9d8531d9b4b0ff22a (diff)
Clang: don't error out on -Wdeprecated-enum-enum-conversion
Same treatment as is given to GCC further below. Change-Id: I3762c39a0b5d9add365ecf828b80d3ba432578c2 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 208cfad9adbea950c6bf9dc2fbc190cfb7e07e20) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtInternalTargets.cmake6
1 files changed, 6 insertions, 0 deletions
diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake
index 86f43fc1b9..d8fa48f236 100644
--- a/cmake/QtInternalTargets.cmake
+++ b/cmake/QtInternalTargets.cmake
@@ -3,6 +3,12 @@ function(qt_internal_set_warnings_are_errors_flags target)
set(flags "")
if (CLANG AND NOT MSVC)
list(APPEND flags -Werror -Wno-error=\#warnings -Wno-error=deprecated-declarations)
+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") # as in: not AppleClang
+ if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "10.0.0")
+ # We do mixed enum arithmetic all over the place:
+ list(APPEND flags -Wno-error=deprecated-enum-enum-conversion)
+ endif()
+ endif()
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
# using GCC
list(APPEND flags -Werror -Wno-error=cpp -Wno-error=deprecated-declarations)