From 83521f66545655ff7f78f18a28920af0d1032f56 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 2 Dec 2024 11:30:11 +0100 Subject: [PATCH] CMake: Add missing SBOM attribution entries Add entries for the cmake 3rd party files, as well as mimetypes and gradient gen. Task-number: QTBUG-122899 Task-number: QTBUG-131477 Change-Id: I22f243798d66422a0b52aa37532eba2b3210c98d Reviewed-by: Alexey Edelev (cherry picked from commit cecff9ec41ca9387386215540cb851ca8b65e2a6) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtPlatformTargetHelpers.cmake | 3 +++ src/corelib/CMakeLists.txt | 2 ++ src/gui/CMakeLists.txt | 2 ++ 3 files changed, 7 insertions(+) diff --git a/cmake/QtPlatformTargetHelpers.cmake b/cmake/QtPlatformTargetHelpers.cmake index 90f159c06c6..981a6462767 100644 --- a/cmake/QtPlatformTargetHelpers.cmake +++ b/cmake/QtPlatformTargetHelpers.cmake @@ -64,6 +64,9 @@ function(qt_internal_setup_public_platform_target) qt_internal_add_sbom(Platform TYPE QT_MODULE + ATTRIBUTION_FILE_DIR_PATHS + "${PROJECT_SOURCE_DIR}/cmake/3rdparty/extra-cmake-modules" + "${PROJECT_SOURCE_DIR}/cmake/3rdparty/kwin" IMMEDIATE_FINALIZATION ) endfunction() diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 41cea955b1e..b6efde6f059 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -1391,6 +1391,8 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database) qt_internal_extend_target(Core SOURCES ${qmimeprovider_db_output} INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/.rcc" + ATTRIBUTION_FILE_DIR_PATHS + mimetypes/3rdparty ) set_source_files_properties(${qmimeprovider_db_output} PROPERTIES GENERATED TRUE diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index f85d38d1cbe..a0f2962d6df 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -301,6 +301,8 @@ qt_internal_add_module(Gui painting text ../3rdparty/VulkanMemoryAllocator + # Used by qbrush.cpp -> painting/webgradients.cpp which is generated by the JS script + ../../util/gradientgen ) # Resources: