diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-06 18:24:11 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-06 21:06:01 +0200 |
| commit | ba104ffb555139c037f8006d83bea6b69795ac91 (patch) | |
| tree | 1b5927e2cf25b5a68a6a49b1e3a16bab045de89c /src/plugins/hardwareintegration/client | |
| parent | 71b06c71ff0d83818c533bc13b8f833cfef96919 (diff) | |
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>
Diffstat (limited to 'src/plugins/hardwareintegration/client')
7 files changed, 7 insertions, 7 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 |