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

CMake: Remove SBOM multi-config dead code

Browse Source 
These variables were not used anywhere.

Pick-to: 6.8 6.9
Task-number: QTBUG-128893
Task-number: QTBUG-122899
Change-Id: If53b3fd8200971dcfde69cefa4df07b67d5669c5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Alexandru Croitor 2024-12-05 17:21:49 +01:00
parent 2fa815341c
commit 42a58d6619
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/QtPublicSbomHelpers.cmake
View File

@ -1450,13 +1450,6 @@ function(_qt_internal_sbom_handle_target_binary_files target)
list(APPEND file_common_options INSTALL_PREFIX "${arg_INSTALL_PREFIX}") list(APPEND file_common_options INSTALL_PREFIX "${arg_INSTALL_PREFIX}")
endif() endif()
get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG)
if(is_multi_config)
set(configs ${CMAKE_CONFIGURATION_TYPES})
else()
set(configs "${CMAKE_BUILD_TYPE}")
endif()
set(path_suffix "$<TARGET_FILE_NAME:${target}>") set(path_suffix "$<TARGET_FILE_NAME:${target}>")
if(arg_FRAMEWORK) if(arg_FRAMEWORK)
@ -1577,12 +1570,6 @@ function(_qt_internal_sbom_add_binary_file target file_path)
endif() endif()
get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG) get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG)
if(is_multi_config)
set(configs ${CMAKE_CONFIGURATION_TYPES})
else()
set(configs "${CMAKE_BUILD_TYPE}")
endif()
if(is_multi_config) if(is_multi_config)
set(spdx_id_suffix "${arg_CONFIG}") set(spdx_id_suffix "${arg_CONFIG}")
set(config_to_install_option CONFIG ${arg_CONFIG}) set(config_to_install_option CONFIG ${arg_CONFIG})