From f1ac316191c010b1389f6f3549c9f0b4424b9936 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 13 Jan 2025 15:30:15 +0100 Subject: CMake: Decouple Qt specific handling from SBOM implementation The SBOM functions so far had a lot of Qt-specific logic inside them. Decouple this logic into separate Qt-specific functions or explicitly guard the code with Qt-specific handling options, to prepare for a cleaner SBOM public API. The generic functions then call the Qt-specific ones if various internal options are set. This approach is used, rather than directly passing values to the generic functions because: - we have cases where we need to recursively pass the values all the way down to all recursively created attribution targets - some of the logic needs to know about values before and after qt processing, and this could be achieved with something like lambdas but it's not worth the complexity Pick-to: 6.8 6.9 Task-number: QTBUG-122899 Change-Id: I4399c41f4d976f20b16a0bb0c674d4f07ee1ccd4 Reviewed-by: Joerg Bornemann --- cmake/QtModuleHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake/QtModuleHelpers.cmake') diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 03c0c67d32d..ea2147d938a 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -991,7 +991,7 @@ set(QT_ALLOW_MISSING_TOOLS_PACKAGES TRUE)") ${__qt_internal_sbom_multi_args} ) - _qt_internal_extend_sbom(${target} ${sbom_args}) + qt_internal_extend_qt_entity_sbom(${target} ${sbom_args}) endif() qt_add_list_file_finalizer(qt_finalize_module ${target} ${arg_INTERNAL_MODULE} ${arg_NO_PRIVATE_MODULE}) -- cgit v1.2.3