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

CMake: Add a function to detect qt 3rd party entity types for SBOM

Browse Source 
Removes some condition duplication.

Pick-to: 6.8
Task-number: QTBUG-122899
Change-Id: Ib245a96b5f8c78b2744cb4fd09a392b2924bf45c
Reviewed-by:  Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Alexandru Croitor 2024-08-29 18:11:15 +02:00
parent 3117d88cdf
commit ce7a01f0ec
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cmake/QtPublicSbomHelpers.cmake
View File

@ -453,6 +453,7 @@ function(_qt_internal_sbom_add_target target)
set(project_package_options "") set(project_package_options "")
_qt_internal_sbom_is_qt_entity_type("${arg_TYPE}" is_qt_entity_type) _qt_internal_sbom_is_qt_entity_type("${arg_TYPE}" is_qt_entity_type)
_qt_internal_sbom_is_qt_3rd_party_entity_type("${arg_TYPE}" is_qt_3rd_party_entity_type)
if(arg_FRIENDLY_PACKAGE_NAME) if(arg_FRIENDLY_PACKAGE_NAME)
set(package_name_for_spdx_id "${arg_FRIENDLY_PACKAGE_NAME}") set(package_name_for_spdx_id "${arg_FRIENDLY_PACKAGE_NAME}")
@ -629,9 +630,7 @@ function(_qt_internal_sbom_add_target target)
endif() endif()
set(supplier "") set(supplier "")
if((is_qt_entity_type if((is_qt_entity_type OR is_qt_3rd_party_entity_type)
OR arg_TYPE STREQUAL "QT_THIRD_PARTY_MODULE"
OR arg_TYPE STREQUAL "QT_THIRD_PARTY_SOURCES")
AND NOT arg_NO_DEFAULT_QT_SUPPLIER) AND NOT arg_NO_DEFAULT_QT_SUPPLIER)
_qt_internal_sbom_get_default_supplier(supplier) _qt_internal_sbom_get_default_supplier(supplier)
endif() endif()
@ -720,8 +719,7 @@ function(_qt_internal_sbom_add_target target)
list(APPEND project_package_options ${purl_package_options}) list(APPEND project_package_options ${purl_package_options})
endif() endif()
if(arg_TYPE STREQUAL "QT_THIRD_PARTY_MODULE" if(is_qt_3rd_party_entity_type
OR arg_TYPE STREQUAL "QT_THIRD_PARTY_SOURCES"
OR arg_TYPE STREQUAL "SYSTEM_LIBRARY" OR arg_TYPE STREQUAL "SYSTEM_LIBRARY"
OR arg_TYPE STREQUAL "THIRD_PARTY_LIBRARY" OR arg_TYPE STREQUAL "THIRD_PARTY_LIBRARY"
OR arg_TYPE STREQUAL "THIRD_PARTY_LIBRARY_WITH_FILES" OR arg_TYPE STREQUAL "THIRD_PARTY_LIBRARY_WITH_FILES"
@ -2560,6 +2558,21 @@ function(_qt_internal_sbom_is_qt_entity_type sbom_type out_var)
set(${out_var} ${is_qt_entity_type} PARENT_SCOPE) set(${out_var} ${is_qt_entity_type} PARENT_SCOPE)
endfunction() endfunction()
# Returns whether the given sbom type is considered to a Qt 3rd party entity type.
function(_qt_internal_sbom_is_qt_3rd_party_entity_type sbom_type out_var)
set(entity_types
QT_THIRD_PARTY_MODULE
QT_THIRD_PARTY_SOURCES
)
set(is_qt_third_party_entity_type FALSE)
if(sbom_type IN_LIST entity_types)
set(is_qt_third_party_entity_type TRUE)
endif()
set(${out_var} ${is_qt_third_party_entity_type} PARENT_SCOPE)
endfunction()
# Save a spdx id for all known related target names of a given Qt target. # Save a spdx id for all known related target names of a given Qt target.
# Related being the namespaced and versionless variants of a Qt target. # Related being the namespaced and versionless variants of a Qt target.
# All the related targets will contain the same spdx id. # All the related targets will contain the same spdx id.