1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set the missing _qt_is_versionless_target property for versionless targets

Browse Source 
Remove the versionless targets handling from pri helpers. This logic is
not relevant anymore since versionless targets hold all the related
properties now.

Amends 173164cd477211e574c0d04abef51aa0f4c3f78d

Change-Id: I933bf7409a3668333929387b8232d002ab6fa66b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2024-03-19 09:49:08 +01:00
parent 840f5c1760
commit e5bb392f72
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/QtPriHelpers.cmake
View File

@ -144,15 +144,6 @@ function(qt_get_direct_module_dependencies target out_var)
continue()
endif()
get_target_property(lib_type ${lib} TYPE)
get_target_property(is_versionless_target ${lib} _qt_is_versionless_target)
if (lib_type STREQUAL "INTERFACE_LIBRARY" AND is_versionless_target)
# Found a version-less target like Qt::Core outside of qtbase.
# Skip this one and use what this target points to, e.g. Qt6::Core.
# Make sure to process Private interface libraries as-is.
get_target_property(ifacelibs ${lib} INTERFACE_LINK_LIBRARIES)
list(PREPEND libs ${ifacelibs})
continue()
endif()
get_target_property(aliased_target ${lib} ALIASED_TARGET)
if(TARGET "${aliased_target}")
# If versionless target is alias, use what the alias points to.

2
cmake/QtPublicCMakeHelpers.cmake
View File

@ -441,5 +441,7 @@ function(_qt_internal_create_versionless_targets targets install_namespace)
${property} "${exported_property_value}")
endif()
endforeach()
set_property(TARGET Qt::${target} PROPERTY _qt_is_versionless_target TRUE)
endforeach()
endfunction()