From ce23c9083f4d06054eb59781c3309b1fcc807a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 5 Apr 2024 14:46:55 +0200 Subject: cmake: Only enable warnings on/off flags for C/C++/Objective-C/C++ The flags are not valid for e.g. Swift Pick-to: 6.7 Change-Id: Ie5b46dc9147d8c024e7e27712c7b8632abd727d9 Reviewed-by: Alexey Edelev --- cmake/QtCompilerFlags.cmake | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'cmake/QtCompilerFlags.cmake') diff --git a/cmake/QtCompilerFlags.cmake b/cmake/QtCompilerFlags.cmake index 8168b70338..f58f36b7a2 100644 --- a/cmake/QtCompilerFlags.cmake +++ b/cmake/QtCompilerFlags.cmake @@ -25,8 +25,15 @@ set(_qt_compiler_warning_flags_condition set(_qt_compiler_warning_flags_genex "$") +set(_qt_compiler_warning_flags_language_condition + "$") +set(_qt_compiler_warning_flags_language_conditional_genex + "$<${_qt_compiler_warning_flags_language_condition}:${_qt_compiler_warning_flags_genex}>") + + # Need to replace semicolons so that the list is not wrongly expanded in the add_compile_options # call. string(REPLACE ";" "$" - _qt_compiler_warning_flags_genex "${_qt_compiler_warning_flags_genex}") -add_compile_options(${_qt_compiler_warning_flags_genex}) + _qt_compiler_warning_flags_language_conditional_genex + "${_qt_compiler_warning_flags_language_conditional_genex}") +add_compile_options(${_qt_compiler_warning_flags_language_conditional_genex}) -- cgit v1.2.3