From 7fa13bac66c3c59dabc8fb5a9ba84d1317eda069 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 10 Jan 2025 17:22:04 +0100 Subject: [PATCH] CMake: Add SUPPLIER as an option to SBOM packages Task-number: QTBUG-122899 Change-Id: I22cae71dcc7582126320e17271a8c55bea1ad393 Reviewed-by: Joerg Bornemann (cherry picked from commit 2857d8d5eaaddde3e3cff916d5ad4b3c93a9b760) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit fe3b0212eac22fb80ec81d24b99ca9d49df2da0e) --- cmake/QtPublicSbomHelpers.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/QtPublicSbomHelpers.cmake b/cmake/QtPublicSbomHelpers.cmake index 025beb58007..73089e1b93c 100644 --- a/cmake/QtPublicSbomHelpers.cmake +++ b/cmake/QtPublicSbomHelpers.cmake @@ -529,6 +529,7 @@ macro(_qt_internal_get_sbom_add_target_common_options opt_args single_args multi set(${single_args} PACKAGE_VERSION FRIENDLY_PACKAGE_NAME + SUPPLIER CPE_VENDOR CPE_PRODUCT LICENSE_EXPRESSION @@ -800,7 +801,9 @@ function(_qt_internal_sbom_add_target target) endif() 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) _qt_internal_sbom_get_default_supplier(supplier) endif()