From 7c1270ea76efea25c8c859dfb5681d5445fdd8b5 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 2 Nov 2022 17:05:40 +0100 Subject: [PATCH] Handle the QT_SKIP_WARNINGS_ARE_ERRORS property when running syncqt When creating the syncqt custom target we only check if the WARNINGS_ARE_ERRORS variable is set. But the warnings-are-errors feature can be disabled using the QT_SKIP_WARNINGS_ARE_ERRORS target property. Add the genex condition to opt out the '-warningsAreErrors' argument using the QT_SKIP_WARNINGS_ARE_ERRORS property. Change-Id: I8e6f89453500335c2b31e6e69c65b351c79dddc2 Reviewed-by: Alexandru Croitor --- cmake/QtSyncQtHelpers.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmake/QtSyncQtHelpers.cmake b/cmake/QtSyncQtHelpers.cmake index 5d80b0d55f7..b434a0beaa2 100644 --- a/cmake/QtSyncQtHelpers.cmake +++ b/cmake/QtSyncQtHelpers.cmake @@ -322,7 +322,14 @@ function(qt_internal_target_sync_headers target module_headers module_headers_ge set(build_time_syncqt_arguments "") if(WARNINGS_ARE_ERRORS) - list(APPEND build_time_syncqt_arguments -warningsAreErrors) + if(is_interface_lib) + set(warnings_are_errors_enabled_genex 1) + else() + set(warnings_are_errors_enabled_genex + "$>>") + endif() + list(APPEND build_time_syncqt_arguments + "$<${warnings_are_errors_enabled_genex}:-warningsAreErrors>") endif() if(is_framework)