From 18355d9d3713a2393ce861dbac138cc57f4a32b5 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 17 Jun 2024 16:04:47 +0200 Subject: [PATCH] CMake: Annotate some targets with SBOM information Pick-to: 6.8 Task-number: QTBUG-122899 Change-Id: I32c1489bbb3e3a48377f6aef94e4cd639257c9a1 Reviewed-by: Lucie Gerard --- src/platformsupport/wayland/CMakeLists.txt | 2 ++ src/plugins/platforms/wayland/CMakeLists.txt | 13 +++++++++++++ .../plugins/decorations/bradient/CMakeLists.txt | 1 + .../hardwareintegration/brcm-egl/CMakeLists.txt | 1 + .../dmabuf-server/CMakeLists.txt | 1 + .../drm-egl-server/CMakeLists.txt | 1 + .../libhybris-egl-server/CMakeLists.txt | 1 + .../shm-emulation-server/CMakeLists.txt | 1 + .../vulkan-server/CMakeLists.txt | 1 + .../hardwareintegration/wayland-egl/CMakeLists.txt | 1 + .../fullscreen-shell-v1/CMakeLists.txt | 3 +++ .../shellintegration/wl-shell/CMakeLists.txt | 3 +++ .../shellintegration/xdg-shell/CMakeLists.txt | 7 +++++++ 13 files changed, 36 insertions(+) diff --git a/src/platformsupport/wayland/CMakeLists.txt b/src/platformsupport/wayland/CMakeLists.txt index a38d9551202..1becbc325ce 100644 --- a/src/platformsupport/wayland/CMakeLists.txt +++ b/src/platformsupport/wayland/CMakeLists.txt @@ -5,6 +5,8 @@ # special case begin qt_find_package(WaylandScanner PROVIDED_TARGETS Wayland::Scanner) +set(QT_SBOM_DEFAULT_QT_LICENSE_ID_LIBRARIES "QT_COMMERCIAL_OR_GPL3") + set(wayland_libs Wayland::Client Wayland::Server diff --git a/src/plugins/platforms/wayland/CMakeLists.txt b/src/plugins/platforms/wayland/CMakeLists.txt index 6e6890ea858..43c6848ea8b 100644 --- a/src/plugins/platforms/wayland/CMakeLists.txt +++ b/src/plugins/platforms/wayland/CMakeLists.txt @@ -78,6 +78,19 @@ qt_internal_add_module(WaylandClient Qt::WaylandGlobalPrivate PRIVATE_HEADER_FILTERS "^qwayland-.*\.h|^wayland-.*-protocol\.h" + QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3 + ATTRIBUTION_FILE_DIR_PATHS + ../3rdparty/protocol/pointer-gestures + ../3rdparty/protocol/tablet + ../3rdparty/protocol/text-input/v1 + ../3rdparty/protocol/text-input/v2 + ../3rdparty/protocol/text-input/v3 + ../3rdparty/protocol/wayland + ../3rdparty/protocol/wp-primary-selection + ../3rdparty/protocol/xdg-output + ../3rdparty/protocol/fractional-scale + ../3rdparty/protocol/viewporter + ../3rdparty/protocol/xdg-shell ) qt6_generate_wayland_protocol_client_sources(WaylandClient diff --git a/src/plugins/platforms/wayland/plugins/decorations/bradient/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/decorations/bradient/CMakeLists.txt index 065d0f18c55..bc25aeb2d4d 100644 --- a/src/plugins/platforms/wayland/plugins/decorations/bradient/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/decorations/bradient/CMakeLists.txt @@ -17,6 +17,7 @@ qt_internal_add_plugin(QWaylandBradientDecorationPlugin Qt::Gui Qt::WaylandClientPrivate Wayland::Client + QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3 ) #### Keys ignored in scope 1:.:.:bradient.pro:: diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/CMakeLists.txt index 90df10d8bdc..6a376ddad3f 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/brcm-egl/CMakeLists.txt @@ -24,6 +24,7 @@ qt_internal_add_plugin(QWaylandBrcmEglClientBufferPlugin Qt::Gui Qt::WaylandClientPrivate Wayland::Client + QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3 ) qt6_generate_wayland_protocol_client_sources(QWaylandBrcmEglClientBufferPlugin diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/CMakeLists.txt index e20820e3b4f..bc6c29ecfbd 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/dmabuf-server/CMakeLists.txt @@ -22,6 +22,7 @@ qt_internal_add_plugin(DmaBufServerBufferPlugin Qt::OpenGL Qt::WaylandClientPrivate Wayland::Client + QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3 ) qt6_generate_wayland_protocol_client_sources(DmaBufServerBufferPlugin diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/CMakeLists.txt index 124c7202686..1b40b7fc041 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/drm-egl-server/CMakeLists.txt @@ -22,6 +22,7 @@ qt_internal_add_plugin(DrmEglServerBufferPlugin Qt::OpenGL Qt::WaylandClientPrivate Wayland::Client + QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3 ) qt6_generate_wayland_protocol_client_sources(DrmEglServerBufferPlugin diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/CMakeLists.txt index 6bf74c1461f..5167cef490b 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/libhybris-egl-server/CMakeLists.txt @@ -21,6 +21,7 @@ qt_internal_add_plugin(LibHybrisEglServerBufferPlugin Qt::Gui Qt::WaylandClientPrivate Wayland::Client + QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3 ) qt6_generate_wayland_protocol_client_sources(LibHybrisEglServerBufferPlugin diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/CMakeLists.txt index 81ff77bab6f..351f7bc8191 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/shm-emulation-server/CMakeLists.txt @@ -21,6 +21,7 @@ qt_internal_add_plugin(ShmServerBufferPlugin Qt::OpenGL Qt::WaylandClientPrivate Wayland::Client + QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3 ) qt6_generate_wayland_protocol_client_sources(ShmServerBufferPlugin diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/CMakeLists.txt index 825b85adbe5..72f527210b7 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/vulkan-server/CMakeLists.txt @@ -21,6 +21,7 @@ qt_internal_add_plugin(VulkanServerBufferPlugin Qt::OpenGL Qt::WaylandClientPrivate Wayland::Client + QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3 ) qt6_generate_wayland_protocol_client_sources(VulkanServerBufferPlugin diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/CMakeLists.txt index 61ee4ea9f8a..e75ce07e530 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/CMakeLists.txt @@ -18,6 +18,7 @@ qt_internal_add_plugin(QWaylandEglClientBufferPlugin Qt::Gui Qt::WaylandClientPrivate Qt::WaylandEglClientHwIntegrationPrivate + QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3 ) #### Keys ignored in scope 1:.:.:wayland-egl.pro:: diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt index e322b5de5d9..693dbde5fe7 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/shellintegration/fullscreen-shell-v1/CMakeLists.txt @@ -20,6 +20,9 @@ qt_internal_add_plugin(QWaylandFullScreenShellV1IntegrationPlugin Qt::GuiPrivate Qt::WaylandClientPrivate Wayland::Client + QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3 + ATTRIBUTION_FILE_DIR_PATHS + ../../../3rdparty/protocol/fullscreen-shell ) qt6_generate_wayland_protocol_client_sources(QWaylandFullScreenShellV1IntegrationPlugin diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt index d55b5cf23ee..b2871c92b14 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/shellintegration/wl-shell/CMakeLists.txt @@ -20,6 +20,9 @@ qt_internal_add_module(WlShellIntegrationPrivate PRIVATE_HEADER_FILTERS "^qwayland-.*\.h|^wayland-.*-protocol\.h" NO_GENERATE_CPP_EXPORTS + QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3 + ATTRIBUTION_FILE_DIR_PATHS + ../../../3rdparty/protocol/wayland ) qt6_generate_wayland_protocol_client_sources(WlShellIntegrationPrivate diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/CMakeLists.txt index de53030ed46..74e925f73cc 100644 --- a/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/shellintegration/xdg-shell/CMakeLists.txt @@ -24,6 +24,13 @@ qt_internal_add_plugin(QWaylandXdgShellIntegrationPlugin Qt::GuiPrivate Qt::WaylandClientPrivate Wayland::Client + QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3 + ATTRIBUTION_FILE_DIR_PATHS + ../../../3rdparty/protocol/xdg-decoration + ../../../3rdparty/protocol/xdg-shell + ../../../3rdparty/protocol/xdg-activation + ../../../3rdparty/protocol/xdg-foreign + ../../../3rdparty/protocol/xdg-dialog ) qt6_generate_wayland_protocol_client_sources(QWaylandXdgShellIntegrationPlugin