From 2220e447ca76805c3fc299fcc4a6a586739deb46 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 9 Jan 2025 14:27:21 +0100 Subject: [PATCH] CMake: Fix file path in checksum computation to allow spaces Pick-to: 6.8 Task-number: QTBUG-122899 Change-Id: Ica5f830e6d7ca9d8acbc13ebec543ee3cf96b3fe Reviewed-by: Alexey Edelev (cherry picked from commit 242e29332373d91e1ffff344e1733bd38094606e) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtPublicSbomGenerationHelpers.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/QtPublicSbomGenerationHelpers.cmake b/cmake/QtPublicSbomGenerationHelpers.cmake index 42d8a7ab45f..bcd16b1e812 100644 --- a/cmake/QtPublicSbomGenerationHelpers.cmake +++ b/cmake/QtPublicSbomGenerationHelpers.cmake @@ -703,7 +703,7 @@ FileCopyrightText: NOASSERTION" endif() set(content " - if(NOT EXISTS \$ENV{DESTDIR}${install_prefix}/${arg_FILENAME} + if(NOT EXISTS \"\$ENV{DESTDIR}${install_prefix}/${arg_FILENAME}\" AND NOT QT_SBOM_BUILD_TIME AND NOT QT_SBOM_FAKE_CHECKSUM) if(NOT ${arg_OPTIONAL}) message(FATAL_ERROR \"Cannot find '${arg_FILENAME}' to compute its checksum. \" @@ -714,7 +714,7 @@ FileCopyrightText: NOASSERTION" if(QT_SBOM_FAKE_CHECKSUM) set(sha1 \"158942a783ee1095eafacaffd93de73edeadbeef\") else() - file(SHA1 \$ENV{DESTDIR}${install_prefix}/${arg_FILENAME} sha1) + file(SHA1 \"\$ENV{DESTDIR}${install_prefix}/${arg_FILENAME}\" sha1) endif() list(APPEND QT_SBOM_VERIFICATION_CODES \${sha1}) endif()