summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <[email protected]>2025-06-04 14:14:11 +0200
committerAlexandru Croitor <[email protected]>2025-06-04 16:51:44 +0200
commit10b93774245065453696adb56fcc9bdf734593a0 (patch)
treed1b4597fa4be872cf1c7ead3094e3991bb52d7d0
parent50665fe4ab7548cf564bd3606135afc98e29c0ee (diff)
CMake: Fix FFMPEG attributions not being added to SBOM after refactorHEADdev
After f1ac316191c010b1389f6f3549c9f0b4424b9936 landed in qtbase, we stopped automatically using qt_attribution.json files for SBOM info unless the USE_ATTRIBUTION_FILES option is passed. Pass it for the FFmpeg attributions. Amends 67aa898218682ed6aa30dd86b2156a521ea47f93 Pick-to: 6.8 6.9 6.10 Task-number: QTBUG-137259 Change-Id: I2153a54aa446bd495250e57d5629b2e315d6c09a Reviewed-by: Joerg Bornemann <[email protected]>
-rw-r--r--src/multimedia/configure.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/multimedia/configure.cmake b/src/multimedia/configure.cmake
index 4d0541c49..d5e7d2dd5 100644
--- a/src/multimedia/configure.cmake
+++ b/src/multimedia/configure.cmake
@@ -80,6 +80,7 @@ qt_find_package_extend_sbom(
FFmpeg::avutil
FFmpeg::swresample
FFmpeg::swscale
+ USE_ATTRIBUTION_FILES
ATTRIBUTION_FILE_DIR_PATHS
# Need to pass an absolute path here, otherwise the file will be relative to the root of
# the source tree, not the current dir, because system libraries are processed in the