From e17115b0c65af95e6fe911f1e491bef9e95a0cf8 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 24 Jul 2024 17:29:11 +0200 Subject: [PATCH] CMake: Expose the short git hash during SBOM generation Task-number: QTBUG-122899 Change-Id: Id87afba7bce4d67984c7e8811444fd35be758bec Reviewed-by: Alexey Edelev Reviewed-by: Joerg Bornemann (cherry picked from commit 3e7fc98063f123d5e2925d47f9278c40535ee452) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtPublicSbomHelpers.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/QtPublicSbomHelpers.cmake b/cmake/QtPublicSbomHelpers.cmake index 00f9e257570..6531d6dfce8 100644 --- a/cmake/QtPublicSbomHelpers.cmake +++ b/cmake/QtPublicSbomHelpers.cmake @@ -76,6 +76,7 @@ function(_qt_internal_sbom_begin_project) set(QT_SBOM_GIT_VERSION "${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_SHORT "") # empty on purpose, no source of info set(non_git_version "${arg_VERSION}") else() # 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_PATH "${__sbom_git_version_path}") set(QT_SBOM_GIT_HASH "${__sbom_git_hash}") + set(QT_SBOM_GIT_HASH_SHORT "${__sbom_git_hash_short}") # Git version might not be available. 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_PATH "${QT_SBOM_GIT_VERSION_PATH}" 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) set(repo_spdx_namespace "${arg_DOCUMENT_NAMESPACE}")