From 9ad537254a8c9e843cfc468bc0614f3c17a646cd Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 17 Jan 2024 07:40:48 +0100 Subject: [PATCH] Cut off the IMPORTED targets from the sync header dependencies IMPORTED targets obviously have nothing to sync. So we should ignore them when collecting dependencies for header sync. Pick-to: 6.6 6.5 Change-Id: Ief68ff5eb2eb13a3fe1608445e8f5e6abb5971b4 Reviewed-by: Alexandru Croitor (cherry picked from commit 868e91474c085bd3bf8c5635fc069731afc2e44a) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtTargetHelpers.cmake | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cmake/QtTargetHelpers.cmake b/cmake/QtTargetHelpers.cmake index 9757a8e7fc5..71ffde93c0f 100644 --- a/cmake/QtTargetHelpers.cmake +++ b/cmake/QtTargetHelpers.cmake @@ -121,13 +121,16 @@ function(qt_internal_extend_target target) # heuristic way of building the dependency tree between the _sync_headers targets of # different Qt modules. if(TARGET "${lib}") - get_target_property(is_private ${lib} _qt_is_private_module) - if(is_private) - get_target_property(lib ${lib} _qt_public_module_target_name) + get_target_property(is_imported ${lib} IMPORTED) + if(NOT is_imported) + get_target_property(is_private ${lib} _qt_is_private_module) + if(is_private) + get_target_property(lib ${lib} _qt_public_module_target_name) + endif() + set(out_genex "$") + set_property(TARGET ${target} + APPEND PROPERTY _qt_internal_sync_headers_deps "${out_genex}") endif() - set(out_genex "$") - set_property(TARGET ${target} - APPEND PROPERTY _qt_internal_sync_headers_deps "${out_genex}") endif() endforeach()