From 10affadd125b615b47979c4469be55bdbe5a189d Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Wed, 5 Mar 2025 12:17:44 +0100 Subject: [PATCH] Use `_qt_internal_dealias_target` Pick-to: 6.9 6.8 Change-Id: Iffc1148ed7655c724ea0609be01978ab7d5e7f8f Reviewed-by: Alexandru Croitor --- cmake/QtAutogenHelpers.cmake | 10 ++-------- cmake/QtFindPackageHelpers.cmake | 5 +---- cmake/QtPluginHelpers.cmake | 5 +---- cmake/QtPublicPluginHelpers.cmake | 5 +---- cmake/QtPublicSbomHelpers.cmake | 5 +---- cmake/QtPublicSbomSystemDepHelpers.cmake | 10 ++-------- cmake/QtPublicTargetHelpers.cmake | 15 +++------------ cmake/QtPublicWalkLibsHelpers.cmake | 5 +---- 8 files changed, 12 insertions(+), 48 deletions(-) diff --git a/cmake/QtAutogenHelpers.cmake b/cmake/QtAutogenHelpers.cmake index bd3162c7468..4bbc6266bf5 100644 --- a/cmake/QtAutogenHelpers.cmake +++ b/cmake/QtAutogenHelpers.cmake @@ -123,10 +123,7 @@ function(qt_manual_moc result) set(dep "${QT_CMAKE_EXPORT_NAMESPACE}::${dep}") endif() - get_target_property(alias_dep ${dep} ALIASED_TARGET) - if(alias_dep) - set(dep ${alias_dep}) - endif() + _qt_internal_dealias_target(dep) get_target_property(loc ${dep} IMPORTED_LOCATION) string(REGEX REPLACE "(.*)/Qt[^/]+\\.framework.*" "\\1" loc "${loc}") @@ -236,10 +233,7 @@ function(qt_internal_work_around_autogen_discarded_dependencies target) endif() # Resolve alias targets, because AUTOGEN_TARGET_DEPENDS doesn't seem to handle them. - get_target_property(aliased_target "${lib}" ALIASED_TARGET) - if(aliased_target) - set(lib "${aliased_target}") - endif() + _qt_internal_dealias_target(lib) # Skip imported targets, they don't have sync_headers targets. get_target_property(imported "${lib}" IMPORTED) diff --git a/cmake/QtFindPackageHelpers.cmake b/cmake/QtFindPackageHelpers.cmake index 743c2e6dfb7..9143f560e2c 100644 --- a/cmake/QtFindPackageHelpers.cmake +++ b/cmake/QtFindPackageHelpers.cmake @@ -162,10 +162,7 @@ macro(qt_find_package) foreach(qt_find_package_target_name ${arg_PROVIDED_TARGETS}) if(TARGET ${qt_find_package_target_name}) # Allow usage of aliased targets by setting properties on the actual target - get_target_property(aliased_target ${qt_find_package_target_name} ALIASED_TARGET) - if(aliased_target) - set(qt_find_package_target_name ${aliased_target}) - endif() + _qt_internal_dealias_target(qt_find_package_target_name) if("${qt_find_package_target_name}" MATCHES "${QT_CMAKE_EXPORT_NAMESPACE}::" AND QT_FEATURE_developer_build diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake index d167e616d37..25380285ae1 100644 --- a/cmake/QtPluginHelpers.cmake +++ b/cmake/QtPluginHelpers.cmake @@ -214,10 +214,7 @@ function(qt_internal_add_plugin target) set(plugin_install_package_suffix "${qt_module}") - get_target_property(aliased_target ${qt_module_target} ALIASED_TARGET) - if(aliased_target) - set(qt_module_target ${aliased_target}) - endif() + _qt_internal_dealias_target(qt_module_target) get_target_property(is_imported_qt_module ${qt_module_target} IMPORTED) if(NOT is_imported_qt_module) diff --git a/cmake/QtPublicPluginHelpers.cmake b/cmake/QtPublicPluginHelpers.cmake index 865311478a3..44ceb92e246 100644 --- a/cmake/QtPublicPluginHelpers.cmake +++ b/cmake/QtPublicPluginHelpers.cmake @@ -540,10 +540,7 @@ macro(__qt_internal_include_plugin_packages target) # Properties can't be set on aliased targets, so make sure to unalias the target. This is needed # when Qt examples are built as part of the Qt build itself. - get_target_property(_aliased_target ${__qt_${target}_plugin_module_target} ALIASED_TARGET) - if(_aliased_target) - set(__qt_${target}_plugin_module_target ${_aliased_target}) - endif() + _qt_internal_dealias_target(__qt_${target}_plugin_module_target) # Ensure that QT_PLUGIN_TARGETS is a known transitive compile property. Works with CMake # versions >= 3.30. diff --git a/cmake/QtPublicSbomHelpers.cmake b/cmake/QtPublicSbomHelpers.cmake index 3767fb4ff26..b12a5867988 100644 --- a/cmake/QtPublicSbomHelpers.cmake +++ b/cmake/QtPublicSbomHelpers.cmake @@ -1516,10 +1516,7 @@ function(_qt_internal_sbom_save_spdx_id_for_target target spdx_id) message(DEBUG "Saving spdx id for target ${target}: ${spdx_id}") set(target_unaliased "${target}") - get_target_property(aliased_target "${target}" ALIASED_TARGET) - if(aliased_target) - set(target_unaliased ${aliased_target}) - endif() + _qt_internal_dealias_target(target_unaliased) set_target_properties(${target_unaliased} PROPERTIES _qt_sbom_spdx_id "${spdx_id}") diff --git a/cmake/QtPublicSbomSystemDepHelpers.cmake b/cmake/QtPublicSbomSystemDepHelpers.cmake index 5b0696c7ca3..f2bee2a73cd 100644 --- a/cmake/QtPublicSbomSystemDepHelpers.cmake +++ b/cmake/QtPublicSbomSystemDepHelpers.cmake @@ -77,10 +77,7 @@ function(_qt_internal_sbom_record_system_library_spdx_ids) # kind of zstd build was done. Make sure to check if the target exists before recording it. if(TARGET "${target}") set(target_unaliased "${target}") - get_target_property(aliased_target "${target}" ALIASED_TARGET) - if(aliased_target) - set(target_unaliased ${aliased_target}) - endif() + _qt_internal_dealias_target(target_unaliased) _qt_internal_sbom_record_system_library_spdx_id(${target_unaliased} ${args}) else() @@ -127,10 +124,7 @@ function(_qt_internal_sbom_add_recorded_system_libraries) # Some system targets like qtspeech SpeechDispatcher::SpeechDispatcher might be aliased, # and we can't set properties on them, so unalias the target name. set(target_original "${target}") - get_target_property(aliased_target "${target}" ALIASED_TARGET) - if(aliased_target) - set(target ${aliased_target}) - endif() + _qt_internal_dealias_target(target) get_property(args GLOBAL PROPERTY _qt_internal_sbom_recorded_system_library_options_${target}) diff --git a/cmake/QtPublicTargetHelpers.cmake b/cmake/QtPublicTargetHelpers.cmake index d2b68d7fed5..b62c5e6ae3d 100644 --- a/cmake/QtPublicTargetHelpers.cmake +++ b/cmake/QtPublicTargetHelpers.cmake @@ -62,10 +62,7 @@ function(__qt_internal_set_link_order_matters target link_order_matters) message(FATAL_ERROR "Unable to set _qt_link_order_matters flag. ${target} is not a target.") endif() - get_target_property(aliased_target ${target} ALIASED_TARGET) - if(aliased_target) - set(target "${aliased_target}") - endif() + _qt_internal_dealias_target(target) if(link_order_matters) set(link_order_matters TRUE) @@ -101,10 +98,7 @@ endfunction() function(__qt_internal_check_cmp0099_available) set(platform_target ${QT_CMAKE_EXPORT_NAMESPACE}::Platform) - get_target_property(aliased_target ${platform_target} ALIASED_TARGET) - if(aliased_target) - set(platform_target "${aliased_target}") - endif() + _qt_internal_dealias_target(platform_target) __qt_internal_get_cmp0099_genex_check(cmp0099_check) set_target_properties(${platform_target} PROPERTIES @@ -224,10 +218,7 @@ function(__qt_internal_collect_object_libraries_recursively out_var target initi set(lib "${CMAKE_MATCH_1}") endif() if(TARGET ${lib}) - get_target_property(aliased_target ${lib} ALIASED_TARGET) - if(aliased_target) - set(lib ${aliased_target}) - endif() + _qt_internal_dealias_target(lib) if(${lib} IN_LIST processed_object_libraries) continue() diff --git a/cmake/QtPublicWalkLibsHelpers.cmake b/cmake/QtPublicWalkLibsHelpers.cmake index 7d3777d612e..7aa26c1af00 100644 --- a/cmake/QtPublicWalkLibsHelpers.cmake +++ b/cmake/QtPublicWalkLibsHelpers.cmake @@ -251,10 +251,7 @@ function(__qt_internal_walk_libs endif() if(operation STREQUAL "promote_3rd_party_global") set(lib_target_unaliased "${lib_target}") - get_target_property(aliased_target ${lib_target} ALIASED_TARGET) - if(aliased_target) - set(lib_target_unaliased ${aliased_target}) - endif() + _qt_internal_dealias_target(lib_target_unaliased) get_property(is_imported TARGET ${lib_target_unaliased} PROPERTY IMPORTED)