Skip to content

Commit d624592

Browse files
committed
CMake: Don't forward FRIENDLY_PACKAGE_NAME to sub-attribution targets
Instead, the package name should be determined by the sub-attribution target name. Otherwise the build system will try to generate multiple files with the same name, but different content. Amends 5daabb5 Pick-to: 6.8 Task-number: QTBUG-122899 Change-Id: I10b4ec2fe8f38d70d13918dc980d1bd1d9145cb6 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
1 parent 55b399f commit d624592

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

cmake/QtPublicSbomHelpers.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2091,6 +2091,10 @@ function(_qt_internal_sbom_handle_qt_attribution_files out_prefix_outer)
20912091
ATTRIBUTION_FILE_DIR_PATHS
20922092
)
20932093

2094+
# Also filter out the FRIENDLY_PACKAGE_NAME option, otherwise we'd try to
2095+
# file(GENERATE) multiple times with the same file name, but different content.
2096+
list(REMOVE_ITEM sbom_single_args FRIENDLY_PACKAGE_NAME)
2097+
20942098
_qt_internal_forward_function_args(
20952099
FORWARD_APPEND
20962100
FORWARD_PREFIX arg

0 commit comments

Comments
 (0)