CMake: Detect 3rd party header modules during SBOM generation
They should inherit the version of the 3rd party library they are part of, and not be treated as Qt modules. Task-number: QTBUG-122899 Change-Id: Ibf99f4481fbc1acca488fc96cca048298b080d35 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit b17dfbbb992b1d38d7a1aeb2b0109bab9cb1e4e3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
1ddf6ea20b
commit
bb26830b3c
@ -428,6 +428,7 @@ function(qt_internal_add_3rdparty_header_module target)
|
||||
_qt_internal_validate_all_args_are_parsed(arg)
|
||||
|
||||
qt_internal_add_module(${target}
|
||||
IS_QT_3RD_PARTY_HEADER_MODULE
|
||||
INTERNAL_MODULE
|
||||
HEADER_MODULE
|
||||
NO_CONFIG_HEADER_FILE
|
||||
|
@ -918,7 +918,13 @@ set(QT_ALLOW_MISSING_TOOLS_PACKAGES TRUE)")
|
||||
|
||||
if(QT_GENERATE_SBOM)
|
||||
set(sbom_args "")
|
||||
list(APPEND sbom_args TYPE QT_MODULE)
|
||||
|
||||
# 3rd party header modules should not be treated as Qt modules.
|
||||
if(arg_IS_QT_3RD_PARTY_HEADER_MODULE)
|
||||
list(APPEND sbom_args TYPE QT_THIRD_PARTY_MODULE)
|
||||
else()
|
||||
list(APPEND sbom_args TYPE QT_MODULE)
|
||||
endif()
|
||||
|
||||
qt_get_cmake_configurations(configs)
|
||||
foreach(config IN LISTS configs)
|
||||
|
@ -318,6 +318,7 @@ macro(_qt_internal_get_sbom_add_target_common_options opt_args single_args multi
|
||||
NO_DEFAULT_QT_PACKAGE_VERSION
|
||||
NO_DEFAULT_QT_SUPPLIER
|
||||
SBOM_INCOMPLETE_3RD_PARTY_DEPENDENCIES
|
||||
IS_QT_3RD_PARTY_HEADER_MODULE
|
||||
)
|
||||
set(${single_args}
|
||||
PACKAGE_VERSION
|
||||
|
Loading…
x
Reference in New Issue
Block a user