blob: 98d5225357e5832b6bb82ca9ea9d6430495724e4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
commit 670a24a87adab6d7b76de60ce67c8eef8433c24c
Author: Friedrich W. H. Kossebau <kossebau@kde.org>
Date: Sat Dec 3 20:33:14 2016 +0100
Remove dep on Qt5::Location, not used
diff --git a/src/plugins/positionprovider/CMakeLists.txt b/src/plugins/positionprovider/CMakeLists.txt
--- a/src/plugins/positionprovider/CMakeLists.txt
+++ b/src/plugins/positionprovider/CMakeLists.txt
@@ -8,17 +8,13 @@ ENDIF(LIBGPS_FOUND)
ADD_SUBDIRECTORY( gpsd )
ENDIF(LIBGPS_FOUND)
-macro_optional_find_package(Qt5Location ${REQUIRED_QT_VERSION})
macro_optional_find_package(Qt5Positioning ${REQUIRED_QT_VERSION})
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} )
|
GitWeb
