zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

cmake updates

QGC4.4
Daniel Agar 5 years ago
parent
3123eb567a
commit
f6c221443f
17 changed files with 159 additions and 83 deletions
Split View
  1. 2
      CMakeLists.txt
  2. 12
      src/AnalyzeView/CMakeLists.txt
  3. 18
      src/AutoPilotPlugins/CMakeLists.txt
  4. 7
      src/AutoPilotPlugins/PX4/CMakeLists.txt
  5. 8
      src/CMakeLists.txt
  6. 13
      src/FactSystem/CMakeLists.txt
  7. 9
      src/FactSystem/FactControls/CMakeLists.txt
  8. 2
      src/FlightDisplay/CMakeLists.txt
  9. 2
      src/FlightMap/CMakeLists.txt
  10. 14
      src/FlightMap/MapItems/CMakeLists.txt
  11. 13
      src/MissionManager/CMakeLists.txt
  12. 6
      src/PlanView/CMakeLists.txt
  13. 12
      src/QmlControls/CMakeLists.txt
  14. 4
      src/Vehicle/CMakeLists.txt
  15. 18
      src/VehicleSetup/CMakeLists.txt
  16. 9
      src/comm/MockLink.cc
  17. 15
      src/qgcunittest/CMakeLists.txt

2
CMakeLists.txt
Unescape View File

@ -13,7 +13,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -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

12
src/AnalyzeView/CMakeLists.txt
Unescape View File

@ -3,17 +3,26 @@ set(EXTRA_SRC) @@ -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 @@ -25,6 +34,7 @@ add_custom_target(AnalyzeViewQml
LogDownloadPage.qml
MavlinkConsolePage.qml
MAVLinkInspectorPage.qml
VibrationPage.qml
)
target_link_libraries(AnalyzeView

18
src/AutoPilotPlugins/CMakeLists.txt
Unescape View File

@ -34,22 +34,38 @@ add_library(AutoPilotPlugins @@ -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
)

7
src/AutoPilotPlugins/PX4/CMakeLists.txt
Unescape View File

@ -2,9 +2,12 @@ add_custom_target(PX4AutoPilotPluginQml @@ -2,9 +2,12 @@ add_custom_target(PX4AutoPilotPluginQml
SOURCES
AirframeComponent.qml
AirframeComponentSummary.qml
BatteryParams.qml
CameraComponent.qml
CameraComponentSummary.qml
FlightModesComponentSummary.qml
PowerComponent.qml
PowerComponentSummary.qml
PX4AdvancedFlightModes.qml
PX4FlightModes.qml
PX4RadioComponentSummary.qml
@ -12,12 +15,10 @@ SOURCES @@ -12,12 +15,10 @@ SOURCES
PX4TuningComponentCopter.qml
PX4TuningComponentPlane.qml
PX4TuningComponentVTOL.qml
PowerComponent.qml
PowerComponentSummary.qml
SafetyComponent.qml
SafetyComponentSummary.qml
SensorsComponent.qml
SensorsComponentSummary.qml
SensorsComponentSummaryFixedWing.qml
SensorsComponentSummary.qml
SensorsSetup.qml
)

8
src/CMakeLists.txt
Unescape View File

@ -54,13 +54,13 @@ if(BUILD_TESTING) @@ -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) @@ -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)

13
src/FactSystem/CMakeLists.txt
Unescape View File

@ -5,20 +5,33 @@ set(EXTRA_SRC) @@ -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}
)

9
src/FactSystem/FactControls/CMakeLists.txt
Unescape View File

@ -4,15 +4,16 @@ add_library(FactControls @@ -4,15 +4,16 @@ add_library(FactControls
add_custom_target(FactControlsQml
SOURCES
FactPanelController.h
AltitudeFactTextField.qml
FactCheckBox.qml
FactLabel.qml
FactTextField.qml
FactTextFieldSlider.qml
FactBitmask.qml
FactCheckBox.qml
FactComboBox.qml
FactLabel.qml
FactTextFieldGrid.qml
FactTextField.qml
FactTextFieldRow.qml
FactTextFieldSlider.qml
FactValueSlider.qml
)

2
src/FlightDisplay/CMakeLists.txt
Unescape View File

@ -37,6 +37,8 @@ add_custom_target(FligthDisplayQml @@ -37,6 +37,8 @@ add_custom_target(FligthDisplayQml
PreFlightRCCheck.qml
PreFlightSensorsHealthCheck.qml
PreFlightSoundCheck.qml
ProximityRadarValues.qml
ProximityRadarVideoView.qml
RoverChecklist.qml
SubChecklist.qml
TelemetryValuesBar.qml

2
src/FlightMap/CMakeLists.txt
Unescape View File

@ -19,7 +19,7 @@ target_include_directories(FlightMap @@ -19,7 +19,7 @@ target_include_directories(FlightMap
)
add_custom_target(FligthMapQml
QGCVideoBackground.qml
FlightMap.qml
MapScale.qml
QGCVideoBackground.qml
)

14
src/FlightMap/MapItems/CMakeLists.txt
Unescape View File

@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
add_custom_target(FligthMapItemsQml
SOURCES
PolygonEditor.qml
CameraTriggerIndicator.qml
CustomMapItems.qml
MissionItemIndicatorDrag.qml
MissionItemIndicator.qml
MissionItemView.qml
VehicleMapItem.qml
MissionItemIndicatorDrag.qml
CustomMapItems.qml
PlanMapItems.qml
MissionLineView.qml
CameraTriggerIndicator.qml
PlanMapItems.qml
PolygonEditor.qml
ProximityRadarMapView.qml
SplitIndicator.qml
VehicleMapItem.qml
)

13
src/MissionManager/CMakeLists.txt
Unescape View File

@ -10,6 +10,10 @@ if(BUILD_TESTING) @@ -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) @@ -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 @@ -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,6 +143,8 @@ add_library(MissionManager @@ -138,6 +143,8 @@ add_library(MissionManager
add_custom_Target(MisionManagerQml
SOURCES
MapLineArrow.qml
MissionCommandTreeEditorTestWindow.qml
QGCMapCircleVisuals.qml
QGCMapPolygonVisuals.qml
QGCMapPolylineVisuals.qml

6
src/PlanView/CMakeLists.txt
Unescape View File

@ -26,7 +26,13 @@ add_custom_target(PlanViewQml @@ -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
)

12
src/QmlControls/CMakeLists.txt
Unescape View File

@ -55,7 +55,6 @@ add_custom_target(QmlControlsQml @@ -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 @@ -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 @@ -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 @@ -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

4
src/Vehicle/CMakeLists.txt
Unescape View File

@ -4,14 +4,14 @@ if(BUILD_TESTING) @@ -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()

18
src/VehicleSetup/CMakeLists.txt
Unescape View File

@ -1,25 +1,31 @@ @@ -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
FirmwareUpgrade.qml
JoystickConfigAdvanced.qml
JoystickConfigButtons.qml
JoystickConfigCalibration.qml
JoystickConfigGeneral.qml
SetupParameterEditor.qml
VehicleSummary.qml
JoystickConfigButtons.qml
PX4FlowSensor.qml
FirmwareUpgrade.qml
JoystickConfig.qml
JoystickConfigAdvanced.qml
PX4FlowSensor.qml
SetupParameterEditor.qml
SetupView.qml
VehicleSummary.qml
)
target_link_libraries(VehicleSetup

9
src/comm/MockLink.cc
Unescape View File

@ -436,7 +436,9 @@ void MockLink::_sendBatteryStatus(void) @@ -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) @@ -455,7 +457,10 @@ void MockLink::_sendBatteryStatus(void)
_battery2PctRemaining,
_battery2TimeRemaining,
_battery2ChargeState,
rgVoltagesExtNone);
rgVoltagesExtNone,
0, // MAV_BATTERY_MODE
0); // MAV_BATTERY_FAULT
respondWithMavlinkMessage(msg);
}

15
src/qgcunittest/CMakeLists.txt
Unescape View File

@ -1,18 +1,25 @@ @@ -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
)

Write Preview
Loading…
Cancel
Save