diff options
author | Li Xinwei <1326710505@qq.com> | 2021-08-06 20:09:15 +0800 |
---|---|---|
committer | Li Xinwei <1326710505@qq.com> | 2021-08-06 13:18:25 +0000 |
commit | de3961f6da9fa3fe32ecb97714dee02be006080e (patch) | |
tree | 0dae3262d001ef29f82000b839cf8d94271b4ec5 /src/plugins | |
parent | cfef2066c06eab6767d1758ead265ea36ef1c685 (diff) | |
download | qtlocation-de3961f6da9fa3fe32ecb97714dee02be006080e.tar.gz |
CMake: Don't give plugins PUBLIC usage requirements part 2
Amends bc9ddc25379b969b8e751a192ba66093a7b7dbc2
Pick-to: 6.2
Task-number: QTBUG-90819
Change-Id: I91d61a86d7ea79b371de7586b3406bd3b3d3c66b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/position/android/src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/position/corelocation/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/position/gypsy/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/plugins/position/winrt/CMakeLists.txt | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/position/android/src/CMakeLists.txt b/src/plugins/position/android/src/CMakeLists.txt index ed7d4b73..af60c825 100644 --- a/src/plugins/position/android/src/CMakeLists.txt +++ b/src/plugins/position/android/src/CMakeLists.txt @@ -12,7 +12,7 @@ qt_internal_add_plugin(QGeoPositionInfoSourceFactoryAndroid positionfactory_android.cpp positionfactory_android.h qgeopositioninfosource_android.cpp qgeopositioninfosource_android_p.h qgeosatelliteinfosource_android.cpp qgeosatelliteinfosource_android_p.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::CorePrivate Qt::Positioning diff --git a/src/plugins/position/corelocation/CMakeLists.txt b/src/plugins/position/corelocation/CMakeLists.txt index 6d6f9db7..8a0df3f0 100644 --- a/src/plugins/position/corelocation/CMakeLists.txt +++ b/src/plugins/position/corelocation/CMakeLists.txt @@ -10,7 +10,7 @@ qt_internal_add_plugin(QGeoPositionInfoSourceFactoryCL SOURCES qgeopositioninfosource_cl.mm qgeopositioninfosource_cl_p.h qgeopositioninfosourcefactory_cl.h qgeopositioninfosourcefactory_cl.mm - PUBLIC_LIBRARIES + LIBRARIES ${FWCoreLocation} ${FWFoundation} Qt::Core diff --git a/src/plugins/position/gypsy/CMakeLists.txt b/src/plugins/position/gypsy/CMakeLists.txt index 02f31a55..c4aa7aea 100644 --- a/src/plugins/position/gypsy/CMakeLists.txt +++ b/src/plugins/position/gypsy/CMakeLists.txt @@ -14,7 +14,6 @@ qt_internal_add_plugin(QGeoPositionInfoSourceFactoryGypsy LIBRARIES Gypsy::Gypsy Gconf::Gconf - PUBLIC_LIBRARIES Qt::Core Qt::Positioning # special case end diff --git a/src/plugins/position/winrt/CMakeLists.txt b/src/plugins/position/winrt/CMakeLists.txt index 1f93cabd..f3f0675f 100644 --- a/src/plugins/position/winrt/CMakeLists.txt +++ b/src/plugins/position/winrt/CMakeLists.txt @@ -10,7 +10,7 @@ qt_internal_add_plugin(QGeoPositionInfoSourceFactoryWinRT SOURCES qgeopositioninfosource_winrt.cpp qgeopositioninfosource_winrt_p.h qgeopositioninfosourcefactory_winrt.cpp qgeopositioninfosourcefactory_winrt.h - PUBLIC_LIBRARIES + LIBRARIES Qt::Core Qt::CorePrivate Qt::Positioning @@ -23,6 +23,6 @@ qt_internal_add_plugin(QGeoPositionInfoSourceFactoryWinRT ##################################################################### qt_internal_extend_target(QGeoPositionInfoSourceFactoryWinRT CONDITION MSVC AND NOT WINRT - PUBLIC_LIBRARIES + LIBRARIES runtimeobject.lib ) |