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

CMake: Add SUPPLIER as an option to SBOM packages

Browse Source 
Task-number: QTBUG-122899
Change-Id: I22cae71dcc7582126320e17271a8c55bea1ad393
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 2857d8d5eaaddde3e3cff916d5ad4b3c93a9b760)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit fe3b0212eac22fb80ec81d24b99ca9d49df2da0e)
This commit is contained in:
Alexandru Croitor 2025-01-10 17:22:04 +01:00 committed by Qt Cherry-pick Bot
parent 238868c518
commit 7fa13bac66
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/QtPublicSbomHelpers.cmake
View File

@ -529,6 +529,7 @@ macro(_qt_internal_get_sbom_add_target_common_options opt_args single_args multi
set(${single_args} set(${single_args}
PACKAGE_VERSION PACKAGE_VERSION
FRIENDLY_PACKAGE_NAME FRIENDLY_PACKAGE_NAME
SUPPLIER
CPE_VENDOR CPE_VENDOR
CPE_PRODUCT CPE_PRODUCT
LICENSE_EXPRESSION LICENSE_EXPRESSION
@ -800,7 +801,9 @@ function(_qt_internal_sbom_add_target target)
endif() endif()
set(supplier "") set(supplier "")
if((is_qt_entity_type OR is_qt_3rd_party_entity_type) if(arg_SUPPLIER)
set(supplier "${arg_SUPPLIER}")
elseif((is_qt_entity_type OR is_qt_3rd_party_entity_type)
AND NOT arg_NO_DEFAULT_QT_SUPPLIER) AND NOT arg_NO_DEFAULT_QT_SUPPLIER)
_qt_internal_sbom_get_default_supplier(supplier) _qt_internal_sbom_get_default_supplier(supplier)
endif() endif()