summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedrich W. H. Kossebau <kossebau@kde.org>2016-12-03 19:33:14 (GMT)
committerFriedrich W. H. Kossebau <kossebau@kde.org>2016-12-03 21:17:14 (GMT)
commit670a24a87adab6d7b76de60ce67c8eef8433c24c (patch)
tree34c5d6e0ec1e1a8c321b0843bad58e7fc401e77d
parentba0306cfe35dc4adb30d98e1a7e4cfde9d3b3d74 (diff)
Remove dep on Qt5::Location, not used
-rw-r--r--CMakeLists.txt1
-rw-r--r--src/apps/behaim/CMakeLists.txt1
-rw-r--r--src/apps/marble-maps/CMakeLists.txt1
-rw-r--r--src/plugins/positionprovider/CMakeLists.txt10
-rw-r--r--src/plugins/positionprovider/qtpositioning/CMakeLists.txt2
5 files changed, 4 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b79a312..403e789 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,6 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
if(CMAKE_SYSTEM_NAME STREQUAL Android)
find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
COMPONENTS
- Location
Positioning
Multimedia
)
diff --git a/src/apps/behaim/CMakeLists.txt b/src/apps/behaim/CMakeLists.txt
index 02a6e40..e992ab9 100644
--- a/src/apps/behaim/CMakeLists.txt
+++ b/src/apps/behaim/CMakeLists.txt
@@ -22,7 +22,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL Android)
Qt5::Network
Qt5::Sql
Qt5::Svg
- Qt5::Location
Qt5::Positioning
Qt5::AndroidExtras
Qt5::Multimedia
diff --git a/src/apps/marble-maps/CMakeLists.txt b/src/apps/marble-maps/CMakeLists.txt
index ad48474..83846d7 100644
--- a/src/apps/marble-maps/CMakeLists.txt
+++ b/src/apps/marble-maps/CMakeLists.txt
@@ -26,7 +26,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL Android)
Qt5::Network
Qt5::Sql
Qt5::Svg
- Qt5::Location
Qt5::Positioning
Qt5::AndroidExtras
Qt5::Multimedia
diff --git a/src/plugins/positionprovider/CMakeLists.txt b/src/plugins/positionprovider/CMakeLists.txt
index 91f13e2..df66854 100644
--- a/src/plugins/positionprovider/CMakeLists.txt
+++ b/src/plugins/positionprovider/CMakeLists.txt
@@ -10,18 +10,14 @@ ENDIF(LIBGPS_FOUND)
find_package(Qt5 ${REQUIRED_QT_VERSION}
COMPONENTS
- Location
Positioning
)
marble_set_package_properties( Qt5Positioning PROPERTIES DESCRIPTION "a collection of APIs and frameworks" )
marble_set_package_properties( Qt5Positioning PROPERTIES URL "http://qt.digia.com/" )
-marble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "Required for QtLocation to work" )
-marble_set_package_properties( Qt5Location PROPERTIES DESCRIPTION "geographical support for position and map use" )
-marble_set_package_properties( Qt5Location PROPERTIES URL "http://qt.digia.com/" )
-marble_set_package_properties( Qt5Location PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning and QtLocation" )
-IF(Qt5Location_FOUND)
+marble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning" )
+if(Qt5Positioning_FOUND)
ADD_SUBDIRECTORY( qtpositioning )
-ENDIF(Qt5Location_FOUND)
+endif()
macro_optional_find_package(libwlocate)
diff --git a/src/plugins/positionprovider/qtpositioning/CMakeLists.txt b/src/plugins/positionprovider/qtpositioning/CMakeLists.txt
index 9079443..e0179bf 100644
--- a/src/plugins/positionprovider/qtpositioning/CMakeLists.txt
+++ b/src/plugins/positionprovider/qtpositioning/CMakeLists.txt
@@ -9,6 +9,6 @@ SET( qtpositioning_SRCS
QtPositioningPositionProviderPlugin.cpp
)
-SET( QtPositioningPositionProviderPlugin_LIBS Qt5::Location Qt5::Positioning )
+SET( QtPositioningPositionProviderPlugin_LIBS Qt5::Positioning )
MARBLE_ADD_PLUGIN( QtPositioningPositionProviderPlugin ${qtpositioning_SRCS} )