From 208cfad9adbea950c6bf9dc2fbc190cfb7e07e20 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 14 Jan 2022 18:03:58 +0100 Subject: Clang: don't error out on -Wdeprecated-enum-enum-conversion Same treatment as is given to GCC further below. Pick-to: 6.3 6.2 Change-Id: I3762c39a0b5d9add365ecf828b80d3ba432578c2 Reviewed-by: Fabian Kosmale --- cmake/QtInternalTargets.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'cmake/QtInternalTargets.cmake') diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake index c1d97da641..0eefc63929 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) -- cgit v1.2.3