summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2021-07-06 18:24:11 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-07-06 20:09:46 +0000
commit2bd7f401681559565786e82526551786d1f82902 (patch)
tree0645099c56bbad0c3d94ad2279e1ec4b7812eedc
parent5ad2fa35aa748da517f491304b46e96dd1cdbea2 (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. 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> (cherry picked from commit d4d1653efc547af7af3f37a51bc97f9945fa5163) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/plugins/canbus/passthrucan/CMakeLists.txt2
-rw-r--r--src/plugins/canbus/peakcan/CMakeLists.txt2
-rw-r--r--src/plugins/canbus/socketcan/CMakeLists.txt2
-rw-r--r--src/plugins/canbus/tinycan/CMakeLists.txt2
-rw-r--r--src/plugins/canbus/virtualcan/CMakeLists.txt2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/canbus/passthrucan/CMakeLists.txt b/src/plugins/canbus/passthrucan/CMakeLists.txt
index f47a874..5dd0261 100644
--- a/src/plugins/canbus/passthrucan/CMakeLists.txt
+++ b/src/plugins/canbus/passthrucan/CMakeLists.txt
@@ -10,6 +10,6 @@ qt_internal_add_plugin(PassThruCanBusPlugin
main.cpp
passthrucanbackend.cpp passthrucanbackend.h
passthrucanio.cpp passthrucanio.h
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::SerialBus
)
diff --git a/src/plugins/canbus/peakcan/CMakeLists.txt b/src/plugins/canbus/peakcan/CMakeLists.txt
index ce0861d..06099d2 100644
--- a/src/plugins/canbus/peakcan/CMakeLists.txt
+++ b/src/plugins/canbus/peakcan/CMakeLists.txt
@@ -9,7 +9,7 @@ qt_internal_add_plugin(PeakCanBusPlugin
main.cpp
peakcan_symbols_p.h
peakcanbackend.cpp peakcanbackend.h peakcanbackend_p.h
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Core
Qt::SerialBus
)
diff --git a/src/plugins/canbus/socketcan/CMakeLists.txt b/src/plugins/canbus/socketcan/CMakeLists.txt
index 34872d2..d3d6bcf 100644
--- a/src/plugins/canbus/socketcan/CMakeLists.txt
+++ b/src/plugins/canbus/socketcan/CMakeLists.txt
@@ -9,7 +9,7 @@ qt_internal_add_plugin(SocketCanBusPlugin
libsocketcan.cpp libsocketcan.h
main.cpp
socketcanbackend.cpp socketcanbackend.h
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Core
Qt::SerialBus
)
diff --git a/src/plugins/canbus/tinycan/CMakeLists.txt b/src/plugins/canbus/tinycan/CMakeLists.txt
index dc2e306..7b03a72 100644
--- a/src/plugins/canbus/tinycan/CMakeLists.txt
+++ b/src/plugins/canbus/tinycan/CMakeLists.txt
@@ -9,7 +9,7 @@ qt_internal_add_plugin(TinyCanBusPlugin
main.cpp
tinycan_symbols_p.h
tinycanbackend.cpp tinycanbackend.h tinycanbackend_p.h
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Core
Qt::SerialBus
)
diff --git a/src/plugins/canbus/virtualcan/CMakeLists.txt b/src/plugins/canbus/virtualcan/CMakeLists.txt
index a0b456c..2467eed 100644
--- a/src/plugins/canbus/virtualcan/CMakeLists.txt
+++ b/src/plugins/canbus/virtualcan/CMakeLists.txt
@@ -8,7 +8,7 @@ qt_internal_add_plugin(VirtualCanBusPlugin
SOURCES
main.cpp
virtualcanbackend.cpp virtualcanbackend.h
- PUBLIC_LIBRARIES
+ LIBRARIES
Qt::Core
Qt::Network
Qt::SerialBus