diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2024-03-19 09:49:08 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2024-03-21 16:23:00 +0100 |
| commit | e5bb392f72ac2d65c63b9753f393db6e503de6fc (patch) | |
| tree | 7df459885d25afe57cb0f9ee127e9d180a9fbe83 /cmake | |
| parent | 840f5c17602bc46871cebef10a48e32ee617c116 (diff) | |
Set the missing _qt_is_versionless_target property for versionless targets
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtPriHelpers.cmake | 9 | ||||
| -rw-r--r-- | cmake/QtPublicCMakeHelpers.cmake | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake index d81de62760..b5e77c1b68 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -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. diff --git a/cmake/QtPublicCMakeHelpers.cmake b/cmake/QtPublicCMakeHelpers.cmake index b8a3e6eef9..23ba0c1028 100644 --- a/cmake/QtPublicCMakeHelpers.cmake +++ b/cmake/QtPublicCMakeHelpers.cmake @@ -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() |