From 3eacac302fd8fc05c9f10c92a9d23cacfeab4280 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Thu, 25 Oct 2018 14:34:41 -0400
Subject: [PATCH] cmake create QtLocationPlugin library in src/QtLocationPlugin

---
 src/CMakeLists.txt                  | 17 ++-------------
 src/QtLocationPlugin/CMakeLists.txt | 34 +++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 src/QtLocationPlugin/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 713c4c15e..908b76765 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,6 @@ include_directories(
 	.
 	${CMAKE_CURRENT_BINARY_DIR}
 
-	QtLocationPlugin/QMLControl
 	${Qt5Location_PRIVATE_INCLUDE_DIRS}
 
 	Camera
@@ -14,7 +13,6 @@ include_directories(
 	Joystick
 	PositionManager
 	qgcunittest
-	QtLocationPlugin
 	Settings
 	Terrain
 	uas
@@ -174,18 +172,6 @@ add_library(qgc
 	PositionManager/PositionManager.cpp
 	PositionManager/SimulatedPosition.cc
 
-	QtLocationPlugin/QGCMapEngine.cpp
-	QtLocationPlugin/QGCMapTileSet.cpp
-	QtLocationPlugin/QGCMapUrlEngine.cpp
-	QtLocationPlugin/QGCTileCacheWorker.cpp
-	QtLocationPlugin/QGeoCodeReplyQGC.cpp
-	QtLocationPlugin/QGeoCodingManagerEngineQGC.cpp
-	QtLocationPlugin/QGeoMapReplyQGC.cpp
-	QtLocationPlugin/QGeoServiceProviderPluginQGC.cpp
-	QtLocationPlugin/QGeoTiledMappingManagerEngineQGC.cpp
-	QtLocationPlugin/QGeoTileFetcherQGC.cpp
-	QtLocationPlugin/QMLControl/QGCMapEngineManager.cc
-
 	Settings/AppSettings.cc
 	Settings/AutoConnectSettings.cc
 	Settings/BrandImageSettings.cc
@@ -251,7 +237,6 @@ add_library(qgc
 
 	# HEADERS
 	# shouldn't be listed here, but aren't named properly for AUTOMOC
-	QtLocationPlugin/QGCMapEngineData.h
 	uas/UAS.h
 	uas/UASInterface.h
 
@@ -272,6 +257,7 @@ add_subdirectory(FirmwarePlugin)
 add_subdirectory(GPS)
 add_subdirectory(MissionManager)
 add_subdirectory(QmlControls)
+add_subdirectory(QtLocationPlugin)
 
 
 target_link_libraries(qgc
@@ -305,6 +291,7 @@ target_link_libraries(qgc
 	qwt # LinechartWidget
 	MissionManager
 	QmlControls
+	QtLocationPlugin
 	ui
 )
 
diff --git a/src/QtLocationPlugin/CMakeLists.txt b/src/QtLocationPlugin/CMakeLists.txt
new file mode 100644
index 000000000..9d9b88701
--- /dev/null
+++ b/src/QtLocationPlugin/CMakeLists.txt
@@ -0,0 +1,34 @@
+
+add_library(QtLocationPlugin
+	QGCMapEngine.cpp
+	QGCMapTileSet.cpp
+	QGCMapUrlEngine.cpp
+	QGCTileCacheWorker.cpp
+	QGeoCodeReplyQGC.cpp
+	QGeoCodingManagerEngineQGC.cpp
+	QGeoMapReplyQGC.cpp
+	QGeoServiceProviderPluginQGC.cpp
+	QGeoTiledMappingManagerEngineQGC.cpp
+	QGeoTileFetcherQGC.cpp
+
+	QMLControl/QGCMapEngineManager.cc
+
+	# HEADERS
+	# shouldn't be listed here, but aren't named properly for AUTOMOC
+	QGCMapEngineData.h
+)
+
+target_link_libraries(QtLocationPlugin
+	PUBLIC
+		Qt5::Location
+
+		qgc
+)
+
+target_include_directories(QtLocationPlugin
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
+	INTERFACE
+		QMLControl
+)
+
-- 
2.22.0