From 3d4501bea7b3a3af36604d0d0eb8ce59dfad7475 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 13 Jan 2025 15:39:31 +0100 Subject: [PATCH] CMake: Remove qt executable SBOM generation stale code We never ended up calling _qt_internal_finalize_sbom for generic Qt repo executables, and we never passed an SBOM type, so this code never worked. Remove it to avoid confusion. It might be re-added in the future. This doesn't affect the SBOM generation for Qt tools and apps. Pick-to: 6.8 Task-number: QTBUG-122899 Change-Id: Iffde964efe2a6b70e6e0b64ec0803af5e84172fb Reviewed-by: Joerg Bornemann (cherry picked from commit f2472c2e6a5b93dfbda166582620c30ea8855edb) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtExecutableHelpers.cmake | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake index 608d52437ea..0ea4729ec3e 100644 --- a/cmake/QtExecutableHelpers.cmake +++ b/cmake/QtExecutableHelpers.cmake @@ -257,23 +257,6 @@ function(qt_internal_add_executable name) qt_internal_install_pdb_files(${name} "${arg_INSTALL_DIRECTORY}") endif() - if(QT_GENERATE_SBOM) - set(sbom_args "") - _qt_internal_forward_function_args( - FORWARD_APPEND - FORWARD_PREFIX arg - FORWARD_OUT_VAR sbom_args - FORWARD_OPTIONS - ${__qt_internal_sbom_optional_args} - FORWARD_SINGLE - ${__qt_internal_sbom_single_args} - FORWARD_MULTI - ${__qt_internal_sbom_multi_args} - ) - - _qt_internal_extend_sbom(${name} ${sbom_args}) - endif() - qt_add_list_file_finalizer(qt_internal_finalize_executable "${name}") endfunction()