From 64d85552b5a9f2d5c4aba408aedd26c8c06faf0c Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Thu, 25 Oct 2018 14:43:42 -0400
Subject: [PATCH] cmake create Settings library in src/Settings

---
 src/CMakeLists.txt          | 16 ++--------------
 src/Settings/CMakeLists.txt | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 src/Settings/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 908b76765..e38f1a469 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,6 @@ include_directories(
 	Joystick
 	PositionManager
 	qgcunittest
-	Settings
 	Terrain
 	uas
 	Vehicle
@@ -172,17 +171,6 @@ add_library(qgc
 	PositionManager/PositionManager.cpp
 	PositionManager/SimulatedPosition.cc
 
-	Settings/AppSettings.cc
-	Settings/AutoConnectSettings.cc
-	Settings/BrandImageSettings.cc
-	Settings/FlightMapSettings.cc
-	Settings/GuidedSettings.cc
-	Settings/RTKSettings.cc
-	Settings/SettingsGroup.cc
-	Settings/SettingsManager.cc
-	Settings/UnitsSettings.cc
-	Settings/VideoSettings.cc
-
 	Terrain/TerrainQuery.cc
 
 	uas/FileManager.cc
@@ -258,6 +246,7 @@ add_subdirectory(GPS)
 add_subdirectory(MissionManager)
 add_subdirectory(QmlControls)
 add_subdirectory(QtLocationPlugin)
+add_subdirectory(Settings)
 
 
 target_link_libraries(qgc
@@ -292,10 +281,9 @@ target_link_libraries(qgc
 	MissionManager
 	QmlControls
 	QtLocationPlugin
+	Settings
 	ui
 )
 
 target_include_directories(qgc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
-
-
diff --git a/src/Settings/CMakeLists.txt b/src/Settings/CMakeLists.txt
new file mode 100644
index 000000000..05a79ac3f
--- /dev/null
+++ b/src/Settings/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+add_library(Settings
+	AppSettings.cc
+	AutoConnectSettings.cc
+	BrandImageSettings.cc
+	FlightMapSettings.cc
+	GuidedSettings.cc
+	RTKSettings.cc
+	SettingsGroup.cc
+	SettingsManager.cc
+	UnitsSettings.cc
+	VideoSettings.cc
+)
+
+target_link_libraries(Settings
+	PUBLIC
+		qgc
+)
+
+target_include_directories(Settings PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
-- 
2.22.0