From 2616fd1cca05febb01023d14f05b5681cd796934 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 18 Oct 2020 11:06:31 -0400
Subject: [PATCH] cmake updates

---
 src/Vehicle/CMakeLists.txt        |  2 ++
 src/ui/CMakeLists.txt             |  3 +--
 src/ui/preferences/CMakeLists.txt | 28 ++++++++++++------------
 src/ui/toolbar/CMakeLists.txt     | 36 ++++++++++++++++---------------
 4 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt
index 21ce21696..e0b16cd64 100644
--- a/src/Vehicle/CMakeLists.txt
+++ b/src/Vehicle/CMakeLists.txt
@@ -58,6 +58,8 @@ add_library(Vehicle
 	VehicleGPSFactGroup.cc
 	VehicleGPSFactGroup.h
 	Vehicle.h
+	VehicleLinkManager.cc
+	VehicleLinkManager.h
 	VehicleObjectAvoidance.cc
 	VehicleObjectAvoidance.h
 	VehicleSetpointFactGroup.cc
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 3da7bd3ba..67026cc4f 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -2,12 +2,10 @@ add_subdirectory(preferences)
 add_subdirectory(toolbar)
 
 add_library(ui
-	QGCMapRCToParamDialog.h
 	QGCPluginHost.cc
 	QGCPluginHost.h
 
 	# UI
-	QGCMapRCToParamDialog.ui
 	QGCPluginHost.ui
 	QMap3D.ui
 )
@@ -31,3 +29,4 @@ target_include_directories(ui
 	PRIVATE
 		linechart
 )
+
diff --git a/src/ui/preferences/CMakeLists.txt b/src/ui/preferences/CMakeLists.txt
index a5a717c75..4f42c721b 100644
--- a/src/ui/preferences/CMakeLists.txt
+++ b/src/ui/preferences/CMakeLists.txt
@@ -1,15 +1,15 @@
 add_custom_target(UiPreferencesQml
-SOURCES
-    SerialSettings.qml
-    HelpSettings.qml
-    TcpSettings.qml
-    MavlinkSettings.qml
-    DebugWindow.qml
-    UdpSettings.qml
-    LinkSettings.qml
-    MockLink.qml
-    GeneralSettings.qml
-    BluetoothSettings.qml
-    LogReplaySettings.qml
-    MockLinkSettings.qml
-)
\ No newline at end of file
+	SOURCES
+		BluetoothSettings.qml
+		DebugWindow.qml
+		GeneralSettings.qml
+		HelpSettings.qml
+		LinkSettings.qml
+		LogReplaySettings.qml
+		MavlinkSettings.qml
+		MockLink.qml
+		MockLinkSettings.qml
+		SerialSettings.qml
+		TcpSettings.qml
+		UdpSettings.qml
+)
diff --git a/src/ui/toolbar/CMakeLists.txt b/src/ui/toolbar/CMakeLists.txt
index b23df04be..eff7ef286 100644
--- a/src/ui/toolbar/CMakeLists.txt
+++ b/src/ui/toolbar/CMakeLists.txt
@@ -1,18 +1,20 @@
 add_custom_target(UiToolbarQml
-SOURCES
-    ArmedIndicator.qml
-    BatteryIndicator.qml
-    GPSIndicator.qml
-    GPSRTKIndicator.qml
-    JoystickIndicator.qml
-    LinkIndicator.qml
-    MainToolBar.qml
-    MainToolBarIndicators.qml
-    MessageIndicator.qml
-    ModeIndicator.qml
-    MultiVehicleSelector.qml
-    RCRSSIIndicator.qml
-    SignalStrength.qml
-    TelemetryRSSIIndicator.qml
-    VTOLModeIndicator.qml
-)
\ No newline at end of file
+	SOURCES
+		ArmedIndicator.qml
+		BatteryIndicator.qml
+		GPSIndicator.qml
+		GPSRTKIndicator.qml
+		JoystickIndicator.qml
+		LinkIndicator.qml
+		MainStatusIndicator.qml
+		MainToolBarIndicators.qml
+		MainToolBar.qml
+		MessageIndicator.qml
+		ModeIndicator.qml
+		MultiVehicleSelector.qml
+		RCRSSIIndicator.qml
+		ROIIndicator.qml
+		SignalStrength.qml
+		TelemetryRSSIIndicator.qml
+		VTOLModeIndicator.qml
+)
-- 
2.22.0