From 94e19f42e80fdd8bc03c2f83b351e9662cdac8a8 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 3 Mar 2025 12:50:15 +0100 Subject: [PATCH] CMake: Remove semicolon from SBOM external document references The external doc references need to be appended as strings, not list elements, otherwise there will be semicolons in the output SPDX file. This issue was inherited as-is from the upstream SBOM generation project. We are fortunate the json converted files are missing the semicolons due to implementation specifics. Pick-to: 6.8 6.9 Task-number: QTBUG-122899 Change-Id: I2b91775d59d64709b72ff7130dd4f6b506ef8244 Reviewed-by: Alexey Edelev --- cmake/QtPublicSbomGenerationHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtPublicSbomGenerationHelpers.cmake b/cmake/QtPublicSbomGenerationHelpers.cmake index 501ad685cd2..d625ab09d61 100644 --- a/cmake/QtPublicSbomGenerationHelpers.cmake +++ b/cmake/QtPublicSbomGenerationHelpers.cmake @@ -814,7 +814,7 @@ function(_qt_internal_sbom_generate_add_external_reference) string(REGEX REPLACE \"^.*[\\r\\n]DocumentNamespace:[ \\t]*([^#\\r\\n]*).*$\" \"\\\\1\" ext_ns \"\${ext_content}\") - list(APPEND QT_SBOM_EXTERNAL_DOC_REFS \" + string(APPEND QT_SBOM_EXTERNAL_DOC_REFS \" ExternalDocumentRef: ${arg_EXTERNAL_DOCUMENT_SPDX_ID} \${ext_ns} SHA1: \${ext_sha1}\") ${relationship_content}