From 434ada8dcb6132b3a597ea56b57a66c627f51728 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 6 Jul 2021 18:24:10 +0200 Subject: 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: Ibc7c2bcd3b6a9dc77df40c4c0c22ff254a80f33d Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor --- src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt | 2 +- .../eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt | 2 +- src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/eglfs/deviceintegration') diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt index 1f75e1717a..d496e334b3 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt @@ -15,7 +15,7 @@ qt_internal_add_plugin(QEglFSEmulatorIntegrationPlugin QT_EGL_NO_X11 INCLUDE_DIRECTORIES ../../api - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::CorePrivate Qt::EglFSDeviceIntegrationPrivate diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt index ceeddb159e..bc033c9f05 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin qeglfskmsegldevicescreen.cpp qeglfskmsegldevicescreen.h DEFINES QT_EGL_NO_X11 - PUBLIC_LIBRARIES + LIBRARIES Libdrm::Libdrm Qt::Core Qt::CorePrivate diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt index 8f94ad1fa0..24190cd811 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_plugin(QEglFSX11IntegrationPlugin QT_EGL_NO_X11 INCLUDE_DIRECTORIES ../../api - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::CorePrivate Qt::EglFSDeviceIntegrationPrivate -- cgit v1.2.3