diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-06 18:24:10 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-07-06 21:05:30 +0200 |
| commit | dc8debe54474f00d374231ce3d619a8209a2f643 (patch) | |
| tree | f36f3cf2f2090d4d028024474b93b4ebf8c8a033 /src | |
| parent | 44e4111f67b5c9c4fc8428e8f491d21c573b58b6 (diff) | |
| download | qtimageformats-dc8debe54474f00d374231ce3d619a8209a2f643.tar.gz | |
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: I8ec7cf501c13cfc9b107ae38f70cba3536b196e4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/imageformats/icns/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/mng/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/imageformats/tga/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/tiff/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/wbmp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/webp/CMakeLists.txt | 4 |
6 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/imageformats/icns/CMakeLists.txt b/src/plugins/imageformats/icns/CMakeLists.txt index 8f6f306..59f84a9 100644 --- a/src/plugins/imageformats/icns/CMakeLists.txt +++ b/src/plugins/imageformats/icns/CMakeLists.txt @@ -13,7 +13,7 @@ qt_internal_add_plugin(QICNSPlugin DEFINES QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::Gui ) diff --git a/src/plugins/imageformats/mng/CMakeLists.txt b/src/plugins/imageformats/mng/CMakeLists.txt index dfb044d..57f0707 100644 --- a/src/plugins/imageformats/mng/CMakeLists.txt +++ b/src/plugins/imageformats/mng/CMakeLists.txt @@ -12,7 +12,6 @@ qt_internal_add_plugin(QMngPlugin qmnghandler.cpp qmnghandler_p.h LIBRARIES Libmng::Libmng - PUBLIC_LIBRARIES Qt::Core Qt::Gui ) diff --git a/src/plugins/imageformats/tga/CMakeLists.txt b/src/plugins/imageformats/tga/CMakeLists.txt index 7a4d4e5..867e194 100644 --- a/src/plugins/imageformats/tga/CMakeLists.txt +++ b/src/plugins/imageformats/tga/CMakeLists.txt @@ -11,7 +11,7 @@ qt_internal_add_plugin(QTgaPlugin main.cpp qtgafile.cpp qtgafile.h qtgahandler.cpp qtgahandler.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::Gui ) diff --git a/src/plugins/imageformats/tiff/CMakeLists.txt b/src/plugins/imageformats/tiff/CMakeLists.txt index 0b87d4a..246b985 100644 --- a/src/plugins/imageformats/tiff/CMakeLists.txt +++ b/src/plugins/imageformats/tiff/CMakeLists.txt @@ -19,7 +19,7 @@ qt_internal_add_plugin(QTiffPlugin SOURCES main.cpp qtiffhandler.cpp qtiffhandler_p.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::Gui ) diff --git a/src/plugins/imageformats/wbmp/CMakeLists.txt b/src/plugins/imageformats/wbmp/CMakeLists.txt index 95cdcd8..d250fee 100644 --- a/src/plugins/imageformats/wbmp/CMakeLists.txt +++ b/src/plugins/imageformats/wbmp/CMakeLists.txt @@ -10,7 +10,7 @@ qt_internal_add_plugin(QWbmpPlugin SOURCES main.cpp qwbmphandler.cpp qwbmphandler_p.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::Gui ) diff --git a/src/plugins/imageformats/webp/CMakeLists.txt b/src/plugins/imageformats/webp/CMakeLists.txt index b5b2c94..183bebb 100644 --- a/src/plugins/imageformats/webp/CMakeLists.txt +++ b/src/plugins/imageformats/webp/CMakeLists.txt @@ -10,7 +10,7 @@ qt_internal_add_plugin(QWebpPlugin SOURCES main.cpp qwebphandler.cpp qwebphandler_p.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::Gui ) @@ -23,7 +23,7 @@ qt_internal_add_plugin(QWebpPlugin ##################################################################### qt_internal_extend_target(QWebpPlugin CONDITION QT_FEATURE_system_webp - PUBLIC_LIBRARIES + LIBRARIES WrapWebP::WrapWebP ) |