diff options
| author | Alexandru Croitor <[email protected]> | 2025-02-24 18:07:22 +0100 |
|---|---|---|
| committer | Alexandru Croitor <[email protected]> | 2025-02-27 13:54:49 +0100 |
| commit | a5c7eb97ceb19ac90f8117240ad04cc717803555 (patch) | |
| tree | 749164154e7fe91023e58a7bf03d86a628284f12 /cmake | |
| parent | a2ddd4fbd88353b21617e539266196b592683a3a (diff) | |
CMake: Re-order SBOM embedded qt_attribution.json fields
Put the attribution file path and entry first, followed by the id,
and the rest of the fields.
Pick-to: 6.8 6.9
Task-number: QTBUG-122899
Change-Id: I478a48980e6207646189d6b80ec57dbc9efb4902
Reviewed-by: Joerg Bornemann <[email protected]>
Reviewed-by: Alexey Edelev <[email protected]>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtPublicSbomHelpers.cmake | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/cmake/QtPublicSbomHelpers.cmake b/cmake/QtPublicSbomHelpers.cmake index 32777438a25..dd93b4336d1 100644 --- a/cmake/QtPublicSbomHelpers.cmake +++ b/cmake/QtPublicSbomHelpers.cmake @@ -967,18 +967,6 @@ function(_qt_internal_sbom_add_target target) endif() if(arg_USE_ATTRIBUTION_FILES) - if(qa_attribution_name) - string(APPEND package_comment " Name: ${qa_attribution_name}\n") - endif() - - if(qa_description) - string(APPEND package_comment " Description: ${qa_description}\n") - endif() - - if(qa_qt_usage) - string(APPEND package_comment " Qt usage: ${qa_qt_usage}\n") - endif() - if(qa_chosen_attribution_file_path) _qt_internal_sbom_map_path_to_reproducible_relative_path(relative_attribution_path PATH "${qa_chosen_attribution_file_path}" @@ -991,6 +979,22 @@ function(_qt_internal_sbom_add_target target) string(APPEND package_comment " Entry index: ${qa_chosen_attribution_entry_index}\n") endif() + + if(qa_attribution_id) + string(APPEND package_comment " Id: ${qa_attribution_id}\n") + endif() + + if(qa_attribution_name) + string(APPEND package_comment " Name: ${qa_attribution_name}\n") + endif() + + if(qa_description) + string(APPEND package_comment " Description: ${qa_description}\n") + endif() + + if(qa_qt_usage) + string(APPEND package_comment " Qt usage: ${qa_qt_usage}\n") + endif() endif() if(package_comment) |