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

CMake: Expose the short git hash during SBOM generation

Browse Source 
Task-number: QTBUG-122899
Change-Id: Id87afba7bce4d67984c7e8811444fd35be758bec
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 3e7fc98063f123d5e2925d47f9278c40535ee452)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2024-07-24 17:29:11 +02:00 committed by Qt Cherry-pick Bot
parent 389aca9b71
commit e17115b0c6
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtPublicSbomHelpers.cmake
View File

@ -76,6 +76,7 @@ function(_qt_internal_sbom_begin_project)
set(QT_SBOM_GIT_VERSION "${arg_VERSION}") set(QT_SBOM_GIT_VERSION "${arg_VERSION}")
set(QT_SBOM_GIT_VERSION_PATH "${arg_VERSION}") set(QT_SBOM_GIT_VERSION_PATH "${arg_VERSION}")
set(QT_SBOM_GIT_HASH "") # empty on purpose, no source of info set(QT_SBOM_GIT_HASH "") # empty on purpose, no source of info
set(QT_SBOM_GIT_HASH_SHORT "") # empty on purpose, no source of info
set(non_git_version "${arg_VERSION}") set(non_git_version "${arg_VERSION}")
else() else()
# Query git version info. # Query git version info.
@ -87,6 +88,7 @@ function(_qt_internal_sbom_begin_project)
set(QT_SBOM_GIT_VERSION "${__sbom_git_version}") set(QT_SBOM_GIT_VERSION "${__sbom_git_version}")
set(QT_SBOM_GIT_VERSION_PATH "${__sbom_git_version_path}") set(QT_SBOM_GIT_VERSION_PATH "${__sbom_git_version_path}")
set(QT_SBOM_GIT_HASH "${__sbom_git_hash}") set(QT_SBOM_GIT_HASH "${__sbom_git_hash}")
set(QT_SBOM_GIT_HASH_SHORT "${__sbom_git_hash_short}")
# Git version might not be available. # Git version might not be available.
set(non_git_version "${QT_REPO_MODULE_VERSION}") set(non_git_version "${QT_REPO_MODULE_VERSION}")
@ -103,6 +105,7 @@ function(_qt_internal_sbom_begin_project)
set(QT_SBOM_GIT_VERSION "${QT_SBOM_GIT_VERSION}" PARENT_SCOPE) set(QT_SBOM_GIT_VERSION "${QT_SBOM_GIT_VERSION}" PARENT_SCOPE)
set(QT_SBOM_GIT_VERSION_PATH "${QT_SBOM_GIT_VERSION_PATH}" PARENT_SCOPE) set(QT_SBOM_GIT_VERSION_PATH "${QT_SBOM_GIT_VERSION_PATH}" PARENT_SCOPE)
set(QT_SBOM_GIT_HASH "${QT_SBOM_GIT_HASH}" PARENT_SCOPE) set(QT_SBOM_GIT_HASH "${QT_SBOM_GIT_HASH}" PARENT_SCOPE)
set(QT_SBOM_GIT_HASH_SHORT "${QT_SBOM_GIT_HASH_SHORT}" PARENT_SCOPE)
if(arg_DOCUMENT_NAMESPACE) if(arg_DOCUMENT_NAMESPACE)
set(repo_spdx_namespace "${arg_DOCUMENT_NAMESPACE}") set(repo_spdx_namespace "${arg_DOCUMENT_NAMESPACE}")