1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Add missing SBOM attribution entries

Browse Source 
Add entries for the cmake 3rd party files, as well as mimetypes
and gradient gen.

Pick-to: 6.8
Task-number: QTBUG-122899
Task-number: QTBUG-131477
Change-Id: I22f243798d66422a0b52aa37532eba2b3210c98d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Alexandru Croitor 2024-12-02 11:30:11 +01:00
parent 2ebca8cde1
commit cecff9ec41
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtPlatformTargetHelpers.cmake
View File

@ -64,6 +64,9 @@ function(qt_internal_setup_public_platform_target)
qt_internal_add_sbom(Platform qt_internal_add_sbom(Platform
TYPE QT_MODULE TYPE QT_MODULE
ATTRIBUTION_FILE_DIR_PATHS
"${PROJECT_SOURCE_DIR}/cmake/3rdparty/extra-cmake-modules"
"${PROJECT_SOURCE_DIR}/cmake/3rdparty/kwin"
IMMEDIATE_FINALIZATION IMMEDIATE_FINALIZATION
) )
endfunction() endfunction()

2
src/corelib/CMakeLists.txt
View File

@ -1415,6 +1415,8 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database)
qt_internal_extend_target(Core qt_internal_extend_target(Core
SOURCES ${qmimeprovider_db_output} SOURCES ${qmimeprovider_db_output}
INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/.rcc" INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/.rcc"
ATTRIBUTION_FILE_DIR_PATHS
mimetypes/3rdparty
) )
set_source_files_properties(${qmimeprovider_db_output} PROPERTIES set_source_files_properties(${qmimeprovider_db_output} PROPERTIES
GENERATED TRUE GENERATED TRUE

2
src/gui/CMakeLists.txt
View File

@ -306,6 +306,8 @@ qt_internal_add_module(Gui
painting painting
text text
../3rdparty/VulkanMemoryAllocator ../3rdparty/VulkanMemoryAllocator
# Used by qbrush.cpp -> painting/webgradients.cpp which is generated by the JS script
../../util/gradientgen
) )
# Resources: # Resources: