whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Don't record provided targets for Qt6 package 

Due to QTBUG-125371 we currently record Qt6 as a third party
dependency for many qt packages.

Until that is fixed, we should not record the provided targets of the
Qt6 package, because it causes issues during SBOM generation.

Amends 58eefbd0b6

Task-number: QTBUG-125371
Change-Id: I35d548996c3820aaa7a1175b3a1f34c23ec2290f
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
bb10
Alexandru Croitor 2024-05-30 11:38:03 +02:00
parent ce33e47667
commit b37c0d7c6c
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmake/QtFindPackageHelpers.cmake
View File

@ -212,14 +212,17 @@ macro(qt_find_package)
${components_as_string})
endif()
# Record the package + component + optional component provided targets.
qt_internal_record_package_component_provided_targets(
PACKAGE_NAME "${ARGV0}"
ON_TARGET ${qt_find_package_target_name}
PROVIDED_TARGETS ${arg_PROVIDED_TARGETS}
COMPONENTS ${arg_COMPONENTS}
OPTIONAL_COMPONENTS ${arg_OPTIONAL_COMPONENTS}
)
# Work around: QTBUG-125371
if(NOT "${ARGV0}" STREQUAL "Qt6")
# Record the package + component + optional component provided targets.
qt_internal_record_package_component_provided_targets(
PACKAGE_NAME "${ARGV0}"
ON_TARGET ${qt_find_package_target_name}
PROVIDED_TARGETS ${arg_PROVIDED_TARGETS}
COMPONENTS ${arg_COMPONENTS}
OPTIONAL_COMPONENTS ${arg_OPTIONAL_COMPONENTS}
)
endif()
get_property(is_global TARGET ${qt_find_package_target_name} PROPERTY
IMPORTED_GLOBAL)