From 4d9f2a85d53408fd85800654524acffbcd38238d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 19 Feb 2025 16:29:10 +0100 Subject: [PATCH] configure: Fix the -sbomdir argument The argument must be added in qt_cmdline.cmake to work. Change-Id: Ic256c0fda0caf3794b37ad8c5e8b6515fb45b0e6 Reviewed-by: Alexandru Croitor (cherry picked from commit 5971e94bafacfebdcd28ef84a7cfea61ffd48689) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 3c178b40e74ac3344a50dcb5038e7adf77fe05c4) --- cmake/configure-cmake-mapping.md | 1 + qt_cmdline.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index 382575cf08a..975aadfdb75 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -50,6 +50,7 @@ The following table describes the mapping of configure options to CMake argument | -sbom-json-required | -DQT_SBOM_REQUIRE_GENERATE_JSON=ON | Fails the build if Python deps are not found | | -sbom-verify | -DQT_SBOM_VERIFY=ON | Enables verification of generated SBOMs | | -sbom-verify-required | -DQT_SBOM_REQUIRE_VERIFY=ON | Fails the build if Python deps are not found | +| -sbomdir | -DINSTALL_SBOMDIR= | Installation location of SBOM files. | | -qtinlinenamespace | -DQT_INLINE_NAMESPACE=ON | Make the namespace specified by -qtnamespace an inline one. | | -qtnamespace | -DQT_NAMESPACE= | | | -qtlibinfix | -DQT_LIBINFIX= | | diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index a30031135db..740bcc89dad 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -24,6 +24,7 @@ qt_commandline_option(libdir TYPE string) qt_commandline_option(libexecdir TYPE string) qt_commandline_option(plugindir TYPE string) qt_commandline_option(qmldir TYPE string) +qt_commandline_option(sbomdir TYPE string) qt_commandline_option(settingsdir TYPE string NAME sysconfdir) qt_commandline_option(sysconfdir TYPE string) qt_commandline_option(testsdir TYPE string)