From 7106e492bcbb4ce22bd735c56df459a9744f8c5b Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 17 Mar 2025 10:07:25 +0100 Subject: [PATCH] Fix the condition that enables/defaults exceptions Not sure why it worked at implementation time. But now it definitely doesn't. We may check the EXCEPTIONS flag value, since it's the equivalent of its presence/non-presence in the argument list. Amends f98fd705290ac7bd9434552a07e38b775e6a6dbf Task-number: QTBUG-118901 Pick-to: 6.9 Change-Id: I9769b4921a2f72d31aea2b0bffd2511edd89f88f Reviewed-by: Alexandru Croitor --- cmake/Qt3rdPartyLibraryHelpers.cmake | 2 +- cmake/QtExecutableHelpers.cmake | 2 +- cmake/QtModuleHelpers.cmake | 2 +- cmake/QtPluginHelpers.cmake | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/Qt3rdPartyLibraryHelpers.cmake b/cmake/Qt3rdPartyLibraryHelpers.cmake index b4732525e92..7d97d0e46c4 100644 --- a/cmake/Qt3rdPartyLibraryHelpers.cmake +++ b/cmake/Qt3rdPartyLibraryHelpers.cmake @@ -227,7 +227,7 @@ function(qt_internal_add_3rdparty_library target) qt_autogen_tools_initial_setup(${target}) endif() - if(NOT DEFINED arg_EXCEPTIONS) + if(NOT arg_EXCEPTIONS) qt_internal_set_exceptions_flags("${target}" "DEFAULT") else() qt_internal_set_exceptions_flags("${target}" "${arg_EXCEPTIONS}") diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index 692f76783de..49d341597d1 100644 --- a/cmake/QtExecutableHelpers.cmake +++ b/cmake/QtExecutableHelpers.cmake @@ -188,7 +188,7 @@ function(qt_internal_add_executable name) MACOSX_BUNDLE "${arg_GUI}" ) - if(NOT DEFINED arg_EXCEPTIONS) + if(NOT arg_EXCEPTIONS) qt_internal_set_exceptions_flags("${name}" "DEFAULT") else() qt_internal_set_exceptions_flags("${name}" "${arg_EXCEPTIONS}") diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index a5ab9ec2bff..e033d7cd420 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -664,7 +664,7 @@ function(qt_internal_add_module target) # thus we can't use qt_internal_extend_target()'s PUBLIC_DEFINES option. target_compile_definitions(${target} INTERFACE QT_${module_define_infix}_LIB) - if(NOT DEFINED arg_EXCEPTIONS) + if(NOT arg_EXCEPTIONS) qt_internal_set_exceptions_flags("${target}" "DEFAULT") else() qt_internal_set_exceptions_flags("${target}" "${arg_EXCEPTIONS}") diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake index 25380285ae1..88a5dbbe3e5 100644 --- a/cmake/QtPluginHelpers.cmake +++ b/cmake/QtPluginHelpers.cmake @@ -323,7 +323,7 @@ function(qt_internal_add_plugin target) qt_internal_add_repo_local_defines("${target}") - if(NOT DEFINED arg_EXCEPTIONS) + if(NOT arg_EXCEPTIONS) qt_internal_set_exceptions_flags("${target}" "DEFAULT") else() qt_internal_set_exceptions_flags("${target}" "${arg_EXCEPTIONS}")