CMake: Add SUPPLIER as an option to SBOM packages
Pick-to: 6.8 6.9 Task-number: QTBUG-122899 Change-Id: I22cae71dcc7582126320e17271a8c55bea1ad393 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
4be604c55e
commit
2857d8d5ea
@ -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()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user