From ba08a2fb171c4eff5e8475cd46f43d48aab1a75f Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 14 Jun 2024 17:18:50 +0200 Subject: [PATCH] CMake: Fix assigning per-directory variable license in SBOM The value should be taken from the QT_SBOM_LICENSE_EXPRESSION variable. The '_qt_internal_sbom_get_default_qt_license_id' was a copy paste error. Amends 37a5e001277db9e1392a242171ab2b88cb6c3049 Task-number: QTBUG-122899 Change-Id: I4bcfaaf06af8903af7081130ba3c8285a53d8f4f Reviewed-by: Alexey Edelev (cherry picked from commit 8f04225c5af2a5cb31d2452342b4ec35a10bf77b) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtPublicSbomHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtPublicSbomHelpers.cmake b/cmake/QtPublicSbomHelpers.cmake index e93f7762985..3c5148473b2 100644 --- a/cmake/QtPublicSbomHelpers.cmake +++ b/cmake/QtPublicSbomHelpers.cmake @@ -391,7 +391,7 @@ function(_qt_internal_sbom_add_target target) # Allow setting a license expression per directory scope via a variable. if(is_qt_entity_type AND QT_SBOM_LICENSE_EXPRESSION AND NOT arg_NO_DEFAULT_DIRECTORY_QT_LICENSE) - set(qt_license_expression "${_qt_internal_sbom_get_default_qt_license_id}") + set(qt_license_expression "${QT_SBOM_LICENSE_EXPRESSION}") _qt_internal_sbom_join_two_license_ids_with_op( "${license_expression}" "AND" "${qt_license_expression}" license_expression)