From 20233502f5836295454c5e83ffba2e6df5f08344 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Fri, 4 Sep 2020 10:31:32 -0400 Subject: [PATCH] cmake updates for current master --- CMakeLists.txt | 2 -- src/FlightMap/Widgets/CMakeLists.txt | 3 +-- src/Vehicle/CMakeLists.txt | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b900ace92..48ac9e962 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,8 +163,6 @@ add_subdirectory(libs) add_subdirectory(src) set(QGC_RESOURCES - #HackAndroidFileDialog.qrc - HackFileDialog.qrc qgcresources.qrc qgroundcontrol.qrc qgcimages.qrc diff --git a/src/FlightMap/Widgets/CMakeLists.txt b/src/FlightMap/Widgets/CMakeLists.txt index f60f708b9..1433e8462 100644 --- a/src/FlightMap/Widgets/CMakeLists.txt +++ b/src/FlightMap/Widgets/CMakeLists.txt @@ -3,15 +3,14 @@ add_custom_target(FligthMapWidgetsQml CenterMapDropButton.qml CenterMapDropPanel.qml CompassRing.qml - InstrumentSwipeView.qml MapFitFunctions.qml PhotoVideoControl.qml QGCArtificialHorizon.qml QGCAttitudeHUD.qml QGCAttitudeWidget.qml QGCCompassWidget.qml - QGCInstrumentWidget.qml QGCInstrumentWidgetAlternate.qml + QGCInstrumentWidget.qml QGCMapToolButton.qml QGCPitchIndicator.qml QGCWaypointEditor.qml diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt index c7eb50693..21ce21696 100644 --- a/src/Vehicle/CMakeLists.txt +++ b/src/Vehicle/CMakeLists.txt @@ -44,10 +44,30 @@ add_library(Vehicle TerrainProtocolHandler.h TrajectoryPoints.cc TrajectoryPoints.h + VehicleBatteryFactGroup.cc + VehicleBatteryFactGroup.h Vehicle.cc + VehicleClockFactGroup.cc + VehicleClockFactGroup.h + VehicleDistanceSensorFactGroup.cc + VehicleDistanceSensorFactGroup.h + VehicleEscStatusFactGroup.cc + VehicleEscStatusFactGroup.h + VehicleEstimatorStatusFactGroup.cc + VehicleEstimatorStatusFactGroup.h + VehicleGPSFactGroup.cc + VehicleGPSFactGroup.h Vehicle.h VehicleObjectAvoidance.cc VehicleObjectAvoidance.h + VehicleSetpointFactGroup.cc + VehicleSetpointFactGroup.h + VehicleTemperatureFactGroup.cc + VehicleTemperatureFactGroup.h + VehicleVibrationFactGroup.cc + VehicleVibrationFactGroup.h + VehicleWindFactGroup.cc + VehicleWindFactGroup.h ${EXTRA_SRC} ) -- 2.22.0