diff options
Diffstat (limited to 'src/plugins/hardwareintegration/compositor')
9 files changed, 11 insertions, 19 deletions
diff --git a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt index e48671727..b3ffcb81b 100644 --- a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt @@ -15,12 +15,11 @@ qt_internal_add_plugin(DmaBufServerBufferIntegrationPlugin LIBRARIES EGL::EGL Libdrm::Libdrm - Wayland::Server - PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::WaylandCompositor Qt::WaylandCompositorPrivate + Wayland::Server ) qt6_generate_wayland_protocol_server_sources(DmaBufServerBufferIntegrationPlugin diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt index af4eb7458..61c9c30c7 100644 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt @@ -14,12 +14,11 @@ qt_internal_add_plugin(DrmEglServerBufferIntegrationPlugin ../../../../hardwareintegration/compositor/drm-egl-server LIBRARIES EGL::EGL - Wayland::Server - PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::WaylandCompositor Qt::WaylandCompositorPrivate + Wayland::Server ) qt6_generate_wayland_protocol_server_sources(DrmEglServerBufferIntegrationPlugin diff --git a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt index 6061fce4d..12f411284 100644 --- a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt @@ -17,7 +17,6 @@ qt_internal_add_plugin(QWaylandDmabufClientBufferIntegrationPlugin EGL::EGL Libdrm::Libdrm Wayland::Server - PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::WaylandCompositor diff --git a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt index 0887c5176..2fd08b514 100644 --- a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt @@ -13,12 +13,11 @@ qt_internal_add_plugin(ShmServerBufferIntegrationPlugin INCLUDE_DIRECTORIES ../../../../hardwareintegration/compositor/shm-emulation-server LIBRARIES - Wayland::Server - PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::WaylandCompositor Qt::WaylandCompositorPrivate + Wayland::Server ) qt6_generate_wayland_protocol_server_sources(ShmServerBufferIntegrationPlugin diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt index 661cdac9b..5ebc0dac6 100644 --- a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt @@ -15,13 +15,12 @@ qt_internal_add_plugin(VulkanServerBufferIntegrationPlugin ../../../../hardwareintegration/compositor/vulkan-server ../../../../hardwareintegration/compositor/vulkan-server/../../../3rdparty/util LIBRARIES - Wayland::Server - PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::OpenGLPrivate Qt::WaylandCompositor Qt::WaylandCompositorPrivate + Wayland::Server ) qt6_generate_wayland_protocol_server_sources(VulkanServerBufferIntegrationPlugin diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt index 69b3d3d25..db3ee6337 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt @@ -10,7 +10,7 @@ qt_internal_add_plugin(QWaylandEglClientBufferIntegrationPlugin TYPE wayland-graphics-integration-server SOURCES main.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::WaylandCompositor diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt index af8d167a1..d36e69e51 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt @@ -16,13 +16,12 @@ qt_internal_add_plugin(QWaylandEglStreamClientBufferIntegrationPlugin ../../../../hardwareintegration/compositor/wayland-eglstream-controller LIBRARIES EGL::EGL - Wayland::Egl - Wayland::Server - PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::WaylandCompositor Qt::WaylandCompositorPrivate + Wayland::Egl + Wayland::Server ) qt6_generate_wayland_protocol_server_sources(QWaylandEglStreamClientBufferIntegrationPlugin diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt index 28a1c155d..de75ba7c1 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt @@ -19,9 +19,6 @@ qt_internal_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin ../../../../hardwareintegration/compositor/xcomposite_share LIBRARIES EGL::EGL - Wayland::Server - X11::X11 - PUBLIC_LIBRARIES PkgConfig::XComposite Qt::Core Qt::CorePrivate @@ -29,6 +26,8 @@ qt_internal_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin Qt::GuiPrivate Qt::WaylandCompositor Qt::WaylandCompositorPrivate + Wayland::Server + X11::X11 ) qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeEglClientBufferIntegrationPlugin diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt index c32b25ba7..cc8e02811 100644 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt @@ -17,9 +17,6 @@ qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin ../../../../hardwareintegration/compositor/xcomposite-glx ../../../../hardwareintegration/compositor/xcomposite_share LIBRARIES - Wayland::Server - X11::X11 - PUBLIC_LIBRARIES PkgConfig::XComposite Qt::Core Qt::CorePrivate @@ -27,6 +24,8 @@ qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin Qt::GuiPrivate Qt::WaylandCompositor Qt::WaylandCompositorPrivate + Wayland::Server + X11::X11 ) qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeGlxClientBufferIntegrationPlugin |