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

CMake: Allow adding content to the SBOM repo project comment

Browse Source 
Task-number: QTBUG-122899
Change-Id: I810814afa69ddf6dc89e834f525b62d87c3aa109
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 89daa851afbce9b5c44a807883eb9b6d5ca8aab9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2024-10-17 16:44:31 +02:00 committed by Qt Cherry-pick Bot
parent f60bc34be7
commit 189be8f628
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmake/QtPublicSbomGenerationHelpers.cmake
View File

@ -45,6 +45,7 @@ function(_qt_internal_sbom_begin_project_generate)
COPYRIGHT COPYRIGHT
DOWNLOAD_LOCATION DOWNLOAD_LOCATION
PROJECT PROJECT
PROJECT_COMMENT
PROJECT_FOR_SPDX_ID PROJECT_FOR_SPDX_ID
SUPPLIER SUPPLIER
SUPPLIER_URL SUPPLIER_URL
@ -106,6 +107,19 @@ function(_qt_internal_sbom_begin_project_generate)
qt_internal_sbom_set_default_option_value(DOWNLOAD_LOCATION "NOASSERTION") qt_internal_sbom_set_default_option_value(DOWNLOAD_LOCATION "NOASSERTION")
set(cmake_version "Built by CMake ${CMAKE_VERSION}")
set(system_name_and_processor "${CMAKE_SYSTEM_NAME} (${CMAKE_SYSTEM_PROCESSOR})")
set(default_project_comment
"${cmake_version} with ${cmake_configs} configuration for ${system_name_and_processor}")
set(project_comment "${default_project_comment}")
if(arg_PROJECT_COMMENT)
string(APPEND project_comment "${arg_PROJECT_COMMENT}")
endif()
set(project_comment "<text>${project_comment}</text>")
set(content set(content
"SPDXVersion: SPDX-2.3 "SPDXVersion: SPDX-2.3
DataLicense: CC0-1.0 DataLicense: CC0-1.0
@ -143,7 +157,7 @@ PackageLicenseConcluded: ${arg_LICENSE}
PackageLicenseDeclared: ${arg_LICENSE} PackageLicenseDeclared: ${arg_LICENSE}
PackageCopyrightText: ${arg_COPYRIGHT} PackageCopyrightText: ${arg_COPYRIGHT}
PackageHomePage: ${arg_SUPPLIER_URL} PackageHomePage: ${arg_SUPPLIER_URL}
PackageComment: <text>Built by CMake ${CMAKE_VERSION} with ${cmake_configs} configuration for ${CMAKE_SYSTEM_NAME} (${CMAKE_SYSTEM_PROCESSOR})</text> PackageComment: ${project_comment}
PackageVerificationCode: \${QT_SBOM_VERIFICATION_CODE} PackageVerificationCode: \${QT_SBOM_VERIFICATION_CODE}
BuiltDate: ${current_utc} BuiltDate: ${current_utc}
Relationship: SPDXRef-DOCUMENT DESCRIBES ${project_spdx_id} Relationship: SPDXRef-DOCUMENT DESCRIBES ${project_spdx_id}