From f6c221443f883bc363d4e3bb6431093344e96989 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sun, 18 Oct 2020 11:57:33 -0400 Subject: [PATCH] cmake updates --- CMakeLists.txt | 2 +- src/AnalyzeView/CMakeLists.txt | 12 +++++- src/AutoPilotPlugins/CMakeLists.txt | 18 ++++++++- src/AutoPilotPlugins/PX4/CMakeLists.txt | 45 +++++++++++----------- src/CMakeLists.txt | 8 ++-- src/FactSystem/CMakeLists.txt | 13 +++++++ src/FactSystem/FactControls/CMakeLists.txt | 25 ++++++------ src/FlightDisplay/CMakeLists.txt | 2 + src/FlightMap/CMakeLists.txt | 2 +- src/FlightMap/MapItems/CMakeLists.txt | 24 ++++++------ src/MissionManager/CMakeLists.txt | 17 +++++--- src/PlanView/CMakeLists.txt | 6 +++ src/QmlControls/CMakeLists.txt | 12 +++--- src/Vehicle/CMakeLists.txt | 4 +- src/VehicleSetup/CMakeLists.txt | 28 ++++++++------ src/comm/MockLink.cc | 9 ++++- src/qgcunittest/CMakeLists.txt | 15 ++++++-- 17 files changed, 159 insertions(+), 83 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48ac9e962..f9bf81b3f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) include(FeatureSummary) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - add_compile_options(-Wall -Wextra -Wno-address-of-packed-member) + add_compile_options(-Wall -Wextra) endif() # CMake build type diff --git a/src/AnalyzeView/CMakeLists.txt b/src/AnalyzeView/CMakeLists.txt index 713e7c702..ad410bb38 100644 --- a/src/AnalyzeView/CMakeLists.txt +++ b/src/AnalyzeView/CMakeLists.txt @@ -3,17 +3,26 @@ set(EXTRA_SRC) if(BUILD_TESTING) list(APPEND EXTRA_SRC LogDownloadTest.cc + LogDownloadTest.h ) endif() add_library(AnalyzeView ExifParser.cc + ExifParser.h GeoTagController.cc - MAVLinkInspectorController.cc + GeoTagController.h LogDownloadController.cc + LogDownloadController.h MavlinkConsoleController.cc + MavlinkConsoleController.h + MAVLinkInspectorController.cc + MAVLinkInspectorController.h PX4LogParser.cc + PX4LogParser.h ULogParser.cc + ULogParser.h + ${EXTRA_SRC} ) @@ -25,6 +34,7 @@ add_custom_target(AnalyzeViewQml LogDownloadPage.qml MavlinkConsolePage.qml MAVLinkInspectorPage.qml + VibrationPage.qml ) target_link_libraries(AnalyzeView diff --git a/src/AutoPilotPlugins/CMakeLists.txt b/src/AutoPilotPlugins/CMakeLists.txt index 74f0c094e..13d8ceaef 100644 --- a/src/AutoPilotPlugins/CMakeLists.txt +++ b/src/AutoPilotPlugins/CMakeLists.txt @@ -34,22 +34,38 @@ add_library(AutoPilotPlugins Generic/GenericAutoPilotPlugin.cc - PX4/AirframeComponent.cc PX4/AirframeComponentAirframes.cc + PX4/AirframeComponentAirframes.h + PX4/AirframeComponent.cc PX4/AirframeComponentController.cc + PX4/AirframeComponentController.h + PX4/AirframeComponent.h PX4/CameraComponent.cc + PX4/CameraComponent.h PX4/FlightModesComponent.cc + PX4/FlightModesComponent.h PX4/PowerComponent.cc PX4/PowerComponentController.cc + PX4/PowerComponentController.h + PX4/PowerComponent.h PX4/PX4AdvancedFlightModesController.cc + PX4/PX4AdvancedFlightModesController.h PX4/PX4AirframeLoader.cc + PX4/PX4AirframeLoader.h PX4/PX4AutoPilotPlugin.cc + PX4/PX4AutoPilotPlugin.h PX4/PX4RadioComponent.cc + PX4/PX4RadioComponent.h PX4/PX4SimpleFlightModesController.cc + PX4/PX4SimpleFlightModesController.h PX4/PX4TuningComponent.cc + PX4/PX4TuningComponent.h PX4/SafetyComponent.cc + PX4/SafetyComponent.h PX4/SensorsComponent.cc PX4/SensorsComponentController.cc + PX4/SensorsComponentController.h + PX4/SensorsComponent.h AutoPilotPlugin.cc ) diff --git a/src/AutoPilotPlugins/PX4/CMakeLists.txt b/src/AutoPilotPlugins/PX4/CMakeLists.txt index fcd4ae404..9b012a5e9 100644 --- a/src/AutoPilotPlugins/PX4/CMakeLists.txt +++ b/src/AutoPilotPlugins/PX4/CMakeLists.txt @@ -1,23 +1,24 @@ add_custom_target(PX4AutoPilotPluginQml -SOURCES - AirframeComponent.qml - AirframeComponentSummary.qml - CameraComponent.qml - CameraComponentSummary.qml - FlightModesComponentSummary.qml - PX4AdvancedFlightModes.qml - PX4FlightModes.qml - PX4RadioComponentSummary.qml - PX4SimpleFlightModes.qml - PX4TuningComponentCopter.qml - PX4TuningComponentPlane.qml - PX4TuningComponentVTOL.qml - PowerComponent.qml - PowerComponentSummary.qml - SafetyComponent.qml - SafetyComponentSummary.qml - SensorsComponent.qml - SensorsComponentSummary.qml - SensorsComponentSummaryFixedWing.qml - SensorsSetup.qml -) \ No newline at end of file + SOURCES + AirframeComponent.qml + AirframeComponentSummary.qml + BatteryParams.qml + CameraComponent.qml + CameraComponentSummary.qml + FlightModesComponentSummary.qml + PowerComponent.qml + PowerComponentSummary.qml + PX4AdvancedFlightModes.qml + PX4FlightModes.qml + PX4RadioComponentSummary.qml + PX4SimpleFlightModes.qml + PX4TuningComponentCopter.qml + PX4TuningComponentPlane.qml + PX4TuningComponentVTOL.qml + SafetyComponent.qml + SafetyComponentSummary.qml + SensorsComponent.qml + SensorsComponentSummaryFixedWing.qml + SensorsComponentSummary.qml + SensorsSetup.qml +) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 452f3ba0f..7f3ff2bbc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -54,13 +54,13 @@ if(BUILD_TESTING) add_qgc_test(CorridorScanComplexItemTest) add_qgc_test(FactSystemTestGeneric) add_qgc_test(FactSystemTestPX4) - add_qgc_test(FileDialogTest) - add_qgc_test(FileManagerTest) + #add_qgc_test(FileDialogTest) + #add_qgc_test(FileManagerTest) add_qgc_test(FlightGearUnitTest) add_qgc_test(GeoTest) add_qgc_test(LinkManagerTest) add_qgc_test(LogDownloadTest) - add_qgc_test(MessageBoxTest) + #add_qgc_test(MessageBoxTest) add_qgc_test(MissionCommandTreeTest) add_qgc_test(MissionControllerTest) add_qgc_test(MissionItemTest) @@ -70,7 +70,7 @@ if(BUILD_TESTING) add_qgc_test(PlanMasterControllerTest) add_qgc_test(QGCMapPolygonTest) add_qgc_test(QGCMapPolylineTest) - add_qgc_test(RadioConfigTest) + #add_qgc_test(RadioConfigTest) add_qgc_test(SendMavCommandTest) add_qgc_test(SimpleMissionItemTest) add_qgc_test(SpeedSectionTest) diff --git a/src/FactSystem/CMakeLists.txt b/src/FactSystem/CMakeLists.txt index 24bc8ccf8..b019b2acd 100644 --- a/src/FactSystem/CMakeLists.txt +++ b/src/FactSystem/CMakeLists.txt @@ -5,20 +5,33 @@ set(EXTRA_SRC) if(BUILD_TESTING) list(APPEND EXTRA_SRC FactSystemTestBase.cc + FactSystemTestBase.h FactSystemTestGeneric.cc + FactSystemTestGeneric.h FactSystemTestPX4.cc + FactSystemTestPX4.h ParameterManagerTest.cc + ParameterManagerTest.h ) endif() add_library(FactSystem Fact.cc FactGroup.cc + FactGroup.h + Fact.h FactMetaData.cc + FactMetaData.h FactSystem.cc + FactSystem.h FactValueSliderListModel.cc + FactValueSliderListModel.h ParameterManager.cc + ParameterManager.h SettingsFact.cc + SettingsFact.h + + FactSystemTest.qml ${EXTRA_SRC} ) diff --git a/src/FactSystem/FactControls/CMakeLists.txt b/src/FactSystem/FactControls/CMakeLists.txt index c6d3c7f90..17cdb43f9 100644 --- a/src/FactSystem/FactControls/CMakeLists.txt +++ b/src/FactSystem/FactControls/CMakeLists.txt @@ -3,17 +3,18 @@ add_library(FactControls ) add_custom_target(FactControlsQml - SOURCES - AltitudeFactTextField.qml - FactCheckBox.qml - FactLabel.qml - FactTextField.qml - FactTextFieldSlider.qml - FactBitmask.qml - FactComboBox.qml - FactTextFieldGrid.qml - FactTextFieldRow.qml - FactValueSlider.qml + SOURCES + FactPanelController.h + AltitudeFactTextField.qml + FactBitmask.qml + FactCheckBox.qml + FactComboBox.qml + FactLabel.qml + FactTextFieldGrid.qml + FactTextField.qml + FactTextFieldRow.qml + FactTextFieldSlider.qml + FactValueSlider.qml ) -target_link_libraries(FactControls qgc) \ No newline at end of file +target_link_libraries(FactControls qgc) diff --git a/src/FlightDisplay/CMakeLists.txt b/src/FlightDisplay/CMakeLists.txt index ab48fc85a..29c5ce33f 100644 --- a/src/FlightDisplay/CMakeLists.txt +++ b/src/FlightDisplay/CMakeLists.txt @@ -37,6 +37,8 @@ add_custom_target(FligthDisplayQml PreFlightRCCheck.qml PreFlightSensorsHealthCheck.qml PreFlightSoundCheck.qml + ProximityRadarValues.qml + ProximityRadarVideoView.qml RoverChecklist.qml SubChecklist.qml TelemetryValuesBar.qml diff --git a/src/FlightMap/CMakeLists.txt b/src/FlightMap/CMakeLists.txt index 28ad77063..98d7c534f 100644 --- a/src/FlightMap/CMakeLists.txt +++ b/src/FlightMap/CMakeLists.txt @@ -19,7 +19,7 @@ target_include_directories(FlightMap ) add_custom_target(FligthMapQml - QGCVideoBackground.qml FlightMap.qml MapScale.qml + QGCVideoBackground.qml ) diff --git a/src/FlightMap/MapItems/CMakeLists.txt b/src/FlightMap/MapItems/CMakeLists.txt index 74556fc88..5cd04a4d4 100644 --- a/src/FlightMap/MapItems/CMakeLists.txt +++ b/src/FlightMap/MapItems/CMakeLists.txt @@ -1,12 +1,14 @@ add_custom_target(FligthMapItemsQml -SOURCES - PolygonEditor.qml - MissionItemIndicator.qml - MissionItemView.qml - VehicleMapItem.qml - MissionItemIndicatorDrag.qml - CustomMapItems.qml - PlanMapItems.qml - MissionLineView.qml - CameraTriggerIndicator.qml -) \ No newline at end of file + SOURCES + CameraTriggerIndicator.qml + CustomMapItems.qml + MissionItemIndicatorDrag.qml + MissionItemIndicator.qml + MissionItemView.qml + MissionLineView.qml + PlanMapItems.qml + PolygonEditor.qml + ProximityRadarMapView.qml + SplitIndicator.qml + VehicleMapItem.qml +) diff --git a/src/MissionManager/CMakeLists.txt b/src/MissionManager/CMakeLists.txt index 926ba4d7d..850494782 100644 --- a/src/MissionManager/CMakeLists.txt +++ b/src/MissionManager/CMakeLists.txt @@ -10,6 +10,10 @@ if(BUILD_TESTING) CorridorScanComplexItemTest.h FWLandingPatternTest.cc FWLandingPatternTest.h + LandingComplexItemTest.cc + LandingComplexItemTest.h + MissionCommandTreeEditorTest.cc + MissionCommandTreeEditorTest.h MissionCommandTreeTest.cc MissionCommandTreeTest.h MissionControllerManagerTest.cc @@ -38,10 +42,10 @@ if(BUILD_TESTING) StructureScanComplexItemTest.h SurveyComplexItemTest.cc SurveyComplexItemTest.h - TransectStyleComplexItemTest.cc - TransectStyleComplexItemTest.h TransectStyleComplexItemTestBase.cc TransectStyleComplexItemTestBase.h + TransectStyleComplexItemTest.cc + TransectStyleComplexItemTest.h VisualMissionItemTest.cc VisualMissionItemTest.h ) @@ -105,11 +109,12 @@ add_library(MissionManager QGCMapPolyline.cc QGCMapPolyline.h RallyPoint.cc - RallyPoint.h RallyPointController.cc RallyPointController.h + RallyPoint.h RallyPointManager.cc RallyPointManager.h + Section.h SimpleMissionItem.cc SimpleMissionItem.h SpeedSection.cc @@ -138,8 +143,10 @@ add_library(MissionManager add_custom_Target(MisionManagerQml SOURCES - QGCMapCircleVisuals.qml - QGCMapPolygonVisuals.qml + MapLineArrow.qml + MissionCommandTreeEditorTestWindow.qml + QGCMapCircleVisuals.qml + QGCMapPolygonVisuals.qml QGCMapPolylineVisuals.qml ) diff --git a/src/PlanView/CMakeLists.txt b/src/PlanView/CMakeLists.txt index 04f638cdc..49de423e6 100644 --- a/src/PlanView/CMakeLists.txt +++ b/src/PlanView/CMakeLists.txt @@ -26,7 +26,13 @@ add_custom_target(PlanViewQml StructureScanMapVisual.qml SurveyItemEditor.qml SurveyMapVisual.qml + TakeoffItemMapVisual.qml + TerrainStatus.qml TransectStyleComplexItemStats.qml + TransectStyleComplexItemTabBar.qml + TransectStyleComplexItemTerrainFollow.qml TransectStyleMapVisuals.qml + VTOLLandingPatternEditor.qml + VTOLLandingPatternMapVisual.qml ) diff --git a/src/QmlControls/CMakeLists.txt b/src/QmlControls/CMakeLists.txt index e18b45fa6..f281692a9 100644 --- a/src/QmlControls/CMakeLists.txt +++ b/src/QmlControls/CMakeLists.txt @@ -55,7 +55,6 @@ add_custom_target(QmlControlsQml FlightModeDropdown.qml FlightModeMenu.qml HackAndroidFileDialog.qml - HackFileDialog.qml HeightIndicator.qml HorizontalFactValueGrid.qml IndicatorButton.qml @@ -74,8 +73,9 @@ add_custom_target(QmlControlsQml ModeSwitchDisplay.qml MultiRotorMotorDisplay.qml OfflineMapButton.qml - ParameterEditor.qml + ParameterDiffDialog.qml ParameterEditorDialog.qml + ParameterEditor.qml PIDTuning.qml PreFlightCheckButton.qml PreFlightCheckGroup.qml @@ -88,24 +88,24 @@ add_custom_target(QmlControlsQml QGCControlDebug.qml QGCDynamicObjectManager.qml QGCFileDialog.qml - QGCFlickable.qml QGCFlickableHorizontalIndicator.qml + QGCFlickable.qml QGCFlickableVerticalIndicator.qml QGCGroupBox.qml QGCHoverButton.qml QGCLabel.qml QGCListView.qml QGCMapLabel.qml - QGCMenu.qml QGCMenuItem.qml + QGCMenu.qml QGCMenuSeparator.qml QGCMouseArea.qml QGCMovableItem.qml QGCOptionsComboBox.qml QGCPipOverlay.qml QGCPipState.qml - QGCPopupDialog.qml QGCPopupDialogContainer.qml + QGCPopupDialog.qml QGCRadioButton.qml QGCSlider.qml QGCSwitch.qml @@ -114,8 +114,8 @@ add_custom_target(QmlControlsQml QGCTextField.qml QGCToolBarButton.qml QGCToolInsets.qml - QGCViewDialog.qml QGCViewDialogContainer.qml + QGCViewDialog.qml QGCViewMessage.qml QmlTest.qml RCChannelMonitor.qml diff --git a/src/Vehicle/CMakeLists.txt b/src/Vehicle/CMakeLists.txt index e0b16cd64..c9125e8a2 100644 --- a/src/Vehicle/CMakeLists.txt +++ b/src/Vehicle/CMakeLists.txt @@ -4,14 +4,14 @@ if(BUILD_TESTING) list(APPEND EXTRA_SRC FTPManagerTest.cc FTPManagerTest.h - InitialConnectTest.cc - InitialConnectTest.h RequestMessageTest.cc RequestMessageTest.h SendMavCommandWithHandlerTest.cc SendMavCommandWithHandlerTest.h SendMavCommandWithSignallingTest.cc SendMavCommandWithSignallingTest.h + VehicleLinkManagerTest.cc + VehicleLinkManagerTest.h ) endif() diff --git a/src/VehicleSetup/CMakeLists.txt b/src/VehicleSetup/CMakeLists.txt index 143ced158..81406f7b0 100644 --- a/src/VehicleSetup/CMakeLists.txt +++ b/src/VehicleSetup/CMakeLists.txt @@ -1,25 +1,31 @@ add_library(VehicleSetup Bootloader.cc + Bootloader.h FirmwareImage.cc + FirmwareImage.h FirmwareUpgradeController.cc + FirmwareUpgradeController.h JoystickConfigController.cc + JoystickConfigController.h PX4FirmwareUpgradeThread.cc + PX4FirmwareUpgradeThread.h VehicleComponent.cc + VehicleComponent.h ) add_custom_target(VehicleSetupQml -SOURCES - JoystickConfigCalibration.qml - JoystickConfigGeneral.qml - SetupParameterEditor.qml - VehicleSummary.qml - JoystickConfigButtons.qml - PX4FlowSensor.qml - FirmwareUpgrade.qml - JoystickConfig.qml - JoystickConfigAdvanced.qml - SetupView.qml + SOURCES + FirmwareUpgrade.qml + JoystickConfigAdvanced.qml + JoystickConfigButtons.qml + JoystickConfigCalibration.qml + JoystickConfigGeneral.qml + JoystickConfig.qml + PX4FlowSensor.qml + SetupParameterEditor.qml + SetupView.qml + VehicleSummary.qml ) target_link_libraries(VehicleSetup diff --git a/src/comm/MockLink.cc b/src/comm/MockLink.cc index d09fb1c75..66812cf98 100644 --- a/src/comm/MockLink.cc +++ b/src/comm/MockLink.cc @@ -436,7 +436,9 @@ void MockLink::_sendBatteryStatus(void) _battery1PctRemaining, _battery1TimeRemaining, _battery1ChargeState, - rgVoltagesExtNone); + rgVoltagesExtNone, + 0, // MAV_BATTERY_MODE + 0); // MAV_BATTERY_FAULT respondWithMavlinkMessage(msg); mavlink_msg_battery_status_pack_chan( @@ -455,7 +457,10 @@ void MockLink::_sendBatteryStatus(void) _battery2PctRemaining, _battery2TimeRemaining, _battery2ChargeState, - rgVoltagesExtNone); + rgVoltagesExtNone, + 0, // MAV_BATTERY_MODE + 0); // MAV_BATTERY_FAULT + respondWithMavlinkMessage(msg); } diff --git a/src/qgcunittest/CMakeLists.txt b/src/qgcunittest/CMakeLists.txt index 35bcdd175..5f65805e8 100644 --- a/src/qgcunittest/CMakeLists.txt +++ b/src/qgcunittest/CMakeLists.txt @@ -1,18 +1,25 @@ add_library(qgcunittest #FileDialogTest.cc + #FileDialogTest.h #FileManagerTest.cc - #FlightGearTest.cc + #FileManagerTest.h GeoTest.cc - LinkManagerTest.cc + GeoTest.h #MainWindowTest.cc + #MainWindowTest.h MavlinkLogTest.cc + MavlinkLogTest.h #MessageBoxTest.cc + #MessageBoxTest.h MultiSignalSpy.cc + MultiSignalSpy.h + MultiSignalSpyV2.cc + MultiSignalSpyV2.h #RadioConfigTest.cc - TCPLinkTest.cc - TCPLoopBackServer.cc + #RadioConfigTest.h UnitTest.cc + UnitTest.h UnitTestList.cc ) -- 2.22.0