CMake: Don't give plugins PUBLIC usage requirements

The pro2cmake.py conversion script faithfully reproduced the .pro files
for the plugins, which specified the libraries as public. But in CMake,
the implications of this are that public usage requirements should then
be propagated to consumers. We don't expect any consumers, since a
plugin is created as a MODULE library in CMake, so for Windows we don't
even have an import library to link with. The only exception to this is
for static builds where plugins are created as STATIC libraries
instead, but only in certain controlled situations do we then link to
plugins. Even then, usage requirements are not expected to propagate to
the consumers, so these relationships should always be specified as
private.

Pick-to: 6.2
Task-number: QTBUG-90819
Change-Id: Ia7a8f27d4eecf067055511577ec664ad857905cd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

16 files changed, 18 insertions, 26 deletions

diff --git a/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt
index bda31db01..8476ef7b7 100644
--- a/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/dmabuf-server/CMakeLists.txt
@@ -12,7 +12,7 @@ qt_internal_add_plugin(DmaBufServerBufferPlugin
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/dmabuf-server
-    PUBLIC_LIBRARIES
+    LIBRARIES
         EGL::EGL
         Qt::Core
         Qt::Gui
diff --git a/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt
index b2eabcf44..5e0b08d0a 100644
--- a/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/drm-egl-server/CMakeLists.txt
@@ -12,7 +12,7 @@ qt_internal_add_plugin(DrmEglServerBufferPlugin
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/drm-egl-server
-    PUBLIC_LIBRARIES
+    LIBRARIES
         EGL::EGL
         Qt::Core
         Qt::Gui
diff --git a/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt
index 6b68ab8eb..326dd8254 100644
--- a/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/shm-emulation-server/CMakeLists.txt
@@ -12,7 +12,7 @@ qt_internal_add_plugin(ShmServerBufferPlugin
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/shm-emulation-server
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::OpenGL
diff --git a/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt
index 3cfde4680..bda421eda 100644
--- a/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/vulkan-server/CMakeLists.txt
@@ -12,7 +12,7 @@ qt_internal_add_plugin(VulkanServerBufferPlugin
         main.cpp
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/vulkan-server
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::OpenGL
diff --git a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
index 5baeb7168..a3062eec0 100644
--- a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_internal_add_plugin(QWaylandEglClientBufferPlugin
     TYPE wayland-graphics-integration-client
     SOURCES
         main.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::WaylandClientPrivate
diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
index 9b7324ccd..fa61db72f 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_plugin(QWaylandXCompositeEglClientBufferPlugin
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/xcomposite-egl
         ../../../../hardwareintegration/client/xcomposite_share
-    PUBLIC_LIBRARIES
+    LIBRARIES
         EGL::EGL
         PkgConfig::XComposite
         Qt::Core
diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
index 0f0ea0733..819f10eb7 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferPlugin
     INCLUDE_DIRECTORIES
         ../../../../hardwareintegration/client/xcomposite-glx
         ../../../../hardwareintegration/client/xcomposite_share
-    PUBLIC_LIBRARIES
+    LIBRARIES
         ${CMAKE_DL_LIBS}
         PkgConfig::XComposite
         Qt::Core
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