From e6ba7cfcc06f5f7d896723388b26a4cdff1ba567 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Thu, 20 Aug 2020 15:40:27 -0400
Subject: [PATCH] cmake build updates/fixes

---
 src/CMakeLists.txt                   |  2 --
 src/FlightDisplay/CMakeLists.txt     |  2 +-
 src/FlightMap/Widgets/CMakeLists.txt | 39 +++++++++++++---------------
 src/QmlControls/CMakeLists.txt       | 14 ++++------
 src/Vehicle/CMakeLists.txt           |  2 ++
 5 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 28ce963e3..452f3ba0f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -164,7 +164,6 @@ add_subdirectory(Vehicle)
 add_subdirectory(VehicleSetup)
 add_subdirectory(VideoManager)
 add_subdirectory(VideoReceiver)
-add_subdirectory(ViewWidgets)
 
 target_link_libraries(qgc
 	PRIVATE
@@ -202,7 +201,6 @@ target_link_libraries(qgc
 		Vehicle
 		VehicleSetup
 		VideoManager
-		ViewWidgets
 )
 
 if(BUILD_TESTING)
diff --git a/src/FlightDisplay/CMakeLists.txt b/src/FlightDisplay/CMakeLists.txt
index 8201653a2..ab48fc85a 100644
--- a/src/FlightDisplay/CMakeLists.txt
+++ b/src/FlightDisplay/CMakeLists.txt
@@ -30,7 +30,6 @@ add_custom_target(FligthDisplayQml
 		GuidedToolStripAction.qml
 		MultiRotorChecklist.qml
 		MultiVehicleList.qml
-		MultiVehiclePanel.qml
 		PreFlightBatteryCheck.qml
 		PreFlightCheckList.qml
 		PreFlightCheckListShowAction.qml
@@ -40,6 +39,7 @@ add_custom_target(FligthDisplayQml
 		PreFlightSoundCheck.qml
 		RoverChecklist.qml
 		SubChecklist.qml
+		TelemetryValuesBar.qml
 		TerrainProgress.qml
 		VehicleWarnings.qml
 		VirtualJoystick.qml
diff --git a/src/FlightMap/Widgets/CMakeLists.txt b/src/FlightMap/Widgets/CMakeLists.txt
index 38e766f3e..f60f708b9 100644
--- a/src/FlightMap/Widgets/CMakeLists.txt
+++ b/src/FlightMap/Widgets/CMakeLists.txt
@@ -1,22 +1,19 @@
 add_custom_target(FligthMapWidgetsQml
-SOURCES
-    CenterMapDropButton.qml
-    HealthPageWidget.qml
-    CameraPageWidget.qml
-    QGCAttitudeWidget.qml
-    QGCArtificialHorizon.qml
-    QGCPitchIndicator.qml
-    InstrumentSwipeView.qml
-    QGCInstrumentWidget.qml
-    QGCAttitudeHUD.qml
-    QGCMapToolButton.qml
-    QGCWaypointEditor.qml
-    QGCInstrumentWidgetAlternate.qml
-    ValuePageWidget.qml
-    CenterMapDropPanel.qml
-    VideoPageWidget.qml
-    MapFitFunctions.qml
-    VibrationPageWidget.qml
-    CompassRing.qml
-    QGCCompassWidget.qml
-)
\ No newline at end of file
+	SOURCES
+		CenterMapDropButton.qml
+		CenterMapDropPanel.qml
+		CompassRing.qml
+		InstrumentSwipeView.qml
+		MapFitFunctions.qml
+		PhotoVideoControl.qml
+		QGCArtificialHorizon.qml
+		QGCAttitudeHUD.qml
+		QGCAttitudeWidget.qml
+		QGCCompassWidget.qml
+		QGCInstrumentWidget.qml
+		QGCInstrumentWidgetAlternate.qml
+		QGCMapToolButton.qml
+		QGCPitchIndicator.qml
+		QGCWaypointEditor.qml
+)
+
diff --git a/src/QmlControls/CMakeLists.txt b/src/QmlControls/CMakeLists.txt
index c98eaea69..e18b45fa6 100644
--- a/src/QmlControls/CMakeLists.txt
+++ b/src/QmlControls/CMakeLists.txt
@@ -37,8 +37,6 @@ add_library(QmlControls
 	ToolStripAction.h
 	ToolStripActionList.cc
 	ToolStripActionList.h
-	VerticalFactValueGrid.cc
-	VerticalFactValueGrid.h
 )
 
 add_custom_target(QmlControlsQml
@@ -76,9 +74,8 @@ add_custom_target(QmlControlsQml
 		ModeSwitchDisplay.qml
 		MultiRotorMotorDisplay.qml
 		OfflineMapButton.qml
-		PageView.qml
-		ParameterEditorDialog.qml
 		ParameterEditor.qml
+		ParameterEditorDialog.qml
 		PIDTuning.qml
 		PreFlightCheckButton.qml
 		PreFlightCheckGroup.qml
@@ -91,24 +88,24 @@ add_custom_target(QmlControlsQml
 		QGCControlDebug.qml
 		QGCDynamicObjectManager.qml
 		QGCFileDialog.qml
-		QGCFlickableHorizontalIndicator.qml
 		QGCFlickable.qml
+		QGCFlickableHorizontalIndicator.qml
 		QGCFlickableVerticalIndicator.qml
 		QGCGroupBox.qml
 		QGCHoverButton.qml
 		QGCLabel.qml
 		QGCListView.qml
 		QGCMapLabel.qml
-		QGCMenuItem.qml
 		QGCMenu.qml
+		QGCMenuItem.qml
 		QGCMenuSeparator.qml
 		QGCMouseArea.qml
 		QGCMovableItem.qml
 		QGCOptionsComboBox.qml
 		QGCPipOverlay.qml
 		QGCPipState.qml
-		QGCPopupDialogContainer.qml
 		QGCPopupDialog.qml
+		QGCPopupDialogContainer.qml
 		QGCRadioButton.qml
 		QGCSlider.qml
 		QGCSwitch.qml
@@ -117,8 +114,8 @@ add_custom_target(QmlControlsQml
 		QGCTextField.qml
 		QGCToolBarButton.qml
 		QGCToolInsets.qml
-		QGCViewDialogContainer.qml
 		QGCViewDialog.qml
+		QGCViewDialogContainer.qml
 		QGCViewMessage.qml
 		QmlTest.qml
 		RCChannelMonitor.qml
@@ -131,7 +128,6 @@ add_custom_target(QmlControlsQml
 		ToolStrip.qml
 		VehicleRotationCal.qml
 		VehicleSummaryRow.qml
-		VerticalFactValueGrid.qml
 )
 target_link_libraries(QmlControls
         PUBLIC
diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt
index 6d271954b..c7eb50693 100644
--- a/src/Vehicle/CMakeLists.txt
+++ b/src/Vehicle/CMakeLists.txt
@@ -36,6 +36,8 @@ add_library(Vehicle
 	MultiVehicleManager.h
 	StateMachine.cc
 	StateMachine.h
+	SysStatusSensorInfo.cc
+	SysStatusSensorInfo.h
 	TerrainFactGroup.cc
 	TerrainFactGroup.h
 	TerrainProtocolHandler.cc
-- 
2.22.0