diff options
| author | Alexandru Croitor <[email protected]> | 2025-08-15 18:27:51 +0200 |
|---|---|---|
| committer | Alexandru Croitor <[email protected]> | 2025-08-21 16:26:01 +0200 |
| commit | 1f1a34f6becdd874b5f281f90067fdbb8d4db569 (patch) | |
| tree | dd49122bf274b6747fde4e718f9b66ef8f895f1f /cmake | |
| parent | ecf1e021de519df02b1e13fcc0472bd00f8603fd (diff) | |
Otherwise the file will not be valid.
Pick-to: 6.8 6.9 6.10
Task-number: QTBUG-134894
Change-Id: Ib5b94d24cfac1c11b8c4608872155a080b1e4f89
Reviewed-by: Joerg Bornemann <[email protected]>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtPublicSbomGenerationHelpers.cmake | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/cmake/QtPublicSbomGenerationHelpers.cmake b/cmake/QtPublicSbomGenerationHelpers.cmake index 03b720a048e..64126f59a02 100644 --- a/cmake/QtPublicSbomGenerationHelpers.cmake +++ b/cmake/QtPublicSbomGenerationHelpers.cmake @@ -103,10 +103,19 @@ function(_qt_internal_sbom_begin_project_generate) _qt_internal_sbom_set_default_option_value(NAMESPACE "${arg_SUPPLIER}/spdxdocs/${arg_PROJECT}-${QT_SBOM_GIT_VERSION}") + set(fields "") if(arg_CPE) - set(QT_SBOM_CPE "${arg_CPE}") - else() - set(QT_SBOM_CPE "") + set(fields "${fields} +ExternalRef: SECURITY cpe23Type ${arg_CPE}") + endif() + + set(purl_generic_id "pkg:generic/${arg_SUPPLIER}/${arg_PROJECT}@${QT_SBOM_GIT_VERSION}") + set(fields "${fields} +ExternalRef: PACKAGE-MANAGER purl ${purl_generic_id}") + + if(QT_SBOM_GIT_VERSION) + set(fields "${fields} +PackageVersion: ${QT_SBOM_GIT_VERSION}") endif() string(REGEX REPLACE "[^A-Za-z0-9.]+" "-" arg_PROJECT_FOR_SPDX_ID "${arg_PROJECT_FOR_SPDX_ID}") @@ -170,10 +179,8 @@ Relationship: SPDXRef-compiler BUILD_DEPENDENCY_OF ${project_spdx_id} RelationshipComment: <text>${project_spdx_id} is built by compiler ${CMAKE_CXX_COMPILER_ID} version ${CMAKE_CXX_COMPILER_VERSION}</text> PackageName: ${arg_PROJECT} -SPDXID: ${project_spdx_id} -ExternalRef: SECURITY cpe23Type ${QT_SBOM_CPE} +SPDXID: ${project_spdx_id}${fields} ExternalRef: PACKAGE-MANAGER purl pkg:generic/${arg_SUPPLIER}/${arg_PROJECT}@${QT_SBOM_GIT_VERSION} -PackageVersion: ${QT_SBOM_GIT_VERSION} PackageSupplier: Organization: ${arg_SUPPLIER} PackageDownloadLocation: ${arg_DOWNLOAD_LOCATION} PackageLicenseConcluded: ${arg_LICENSE} |