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
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      CMakeLists.txt
  2. 12
      src/AnalyzeView/CMakeLists.txt
  3. 18
      src/AutoPilotPlugins/CMakeLists.txt
  4. 45
      src/AutoPilotPlugins/PX4/CMakeLists.txt
  5. 8
      src/CMakeLists.txt
  6. 13
      src/FactSystem/CMakeLists.txt
  7. 25
      src/FactSystem/FactControls/CMakeLists.txt
  8. 2
      src/FlightDisplay/CMakeLists.txt
  9. 2
      src/FlightMap/CMakeLists.txt
  10. 24
      src/FlightMap/MapItems/CMakeLists.txt
  11. 17
      src/MissionManager/CMakeLists.txt
  12. 6
      src/PlanView/CMakeLists.txt
  13. 12
      src/QmlControls/CMakeLists.txt
  14. 4
      src/Vehicle/CMakeLists.txt
  15. 28
      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)
include(FeatureSummary) include(FeatureSummary)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") 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() endif()
# CMake build type # CMake build type

12
src/AnalyzeView/CMakeLists.txt
Unescape View File

@ -3,17 +3,26 @@ set(EXTRA_SRC)
if(BUILD_TESTING) if(BUILD_TESTING)
list(APPEND EXTRA_SRC list(APPEND EXTRA_SRC
LogDownloadTest.cc LogDownloadTest.cc
LogDownloadTest.h
) )
endif() endif()
add_library(AnalyzeView add_library(AnalyzeView
ExifParser.cc ExifParser.cc
ExifParser.h
GeoTagController.cc GeoTagController.cc
MAVLinkInspectorController.cc GeoTagController.h
LogDownloadController.cc LogDownloadController.cc
LogDownloadController.h
MavlinkConsoleController.cc MavlinkConsoleController.cc
MavlinkConsoleController.h
MAVLinkInspectorController.cc
MAVLinkInspectorController.h
PX4LogParser.cc PX4LogParser.cc
PX4LogParser.h
ULogParser.cc ULogParser.cc
ULogParser.h
${EXTRA_SRC} ${EXTRA_SRC}
) )
@ -25,6 +34,7 @@ add_custom_target(AnalyzeViewQml
LogDownloadPage.qml LogDownloadPage.qml
MavlinkConsolePage.qml MavlinkConsolePage.qml
MAVLinkInspectorPage.qml MAVLinkInspectorPage.qml
VibrationPage.qml
) )
target_link_libraries(AnalyzeView target_link_libraries(AnalyzeView

18
src/AutoPilotPlugins/CMakeLists.txt
Unescape View File

@ -34,22 +34,38 @@ add_library(AutoPilotPlugins
Generic/GenericAutoPilotPlugin.cc Generic/GenericAutoPilotPlugin.cc
PX4/AirframeComponent.cc
PX4/AirframeComponentAirframes.cc PX4/AirframeComponentAirframes.cc
PX4/AirframeComponentAirframes.h
PX4/AirframeComponent.cc
PX4/AirframeComponentController.cc PX4/AirframeComponentController.cc
PX4/AirframeComponentController.h
PX4/AirframeComponent.h
PX4/CameraComponent.cc PX4/CameraComponent.cc
PX4/CameraComponent.h
PX4/FlightModesComponent.cc PX4/FlightModesComponent.cc
PX4/FlightModesComponent.h
PX4/PowerComponent.cc PX4/PowerComponent.cc
PX4/PowerComponentController.cc PX4/PowerComponentController.cc
PX4/PowerComponentController.h
PX4/PowerComponent.h
PX4/PX4AdvancedFlightModesController.cc PX4/PX4AdvancedFlightModesController.cc
PX4/PX4AdvancedFlightModesController.h
PX4/PX4AirframeLoader.cc PX4/PX4AirframeLoader.cc
PX4/PX4AirframeLoader.h
PX4/PX4AutoPilotPlugin.cc PX4/PX4AutoPilotPlugin.cc
PX4/PX4AutoPilotPlugin.h
PX4/PX4RadioComponent.cc PX4/PX4RadioComponent.cc
PX4/PX4RadioComponent.h
PX4/PX4SimpleFlightModesController.cc PX4/PX4SimpleFlightModesController.cc
PX4/PX4SimpleFlightModesController.h
PX4/PX4TuningComponent.cc PX4/PX4TuningComponent.cc
PX4/PX4TuningComponent.h
PX4/SafetyComponent.cc PX4/SafetyComponent.cc
PX4/SafetyComponent.h
PX4/SensorsComponent.cc PX4/SensorsComponent.cc
PX4/SensorsComponentController.cc PX4/SensorsComponentController.cc
PX4/SensorsComponentController.h
PX4/SensorsComponent.h
AutoPilotPlugin.cc AutoPilotPlugin.cc
) )

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

@ -1,23 +1,24 @@
add_custom_target(PX4AutoPilotPluginQml add_custom_target(PX4AutoPilotPluginQml
SOURCES SOURCES
AirframeComponent.qml AirframeComponent.qml
AirframeComponentSummary.qml AirframeComponentSummary.qml
CameraComponent.qml BatteryParams.qml
CameraComponentSummary.qml CameraComponent.qml
FlightModesComponentSummary.qml CameraComponentSummary.qml
PX4AdvancedFlightModes.qml FlightModesComponentSummary.qml
PX4FlightModes.qml PowerComponent.qml
PX4RadioComponentSummary.qml PowerComponentSummary.qml
PX4SimpleFlightModes.qml PX4AdvancedFlightModes.qml
PX4TuningComponentCopter.qml PX4FlightModes.qml
PX4TuningComponentPlane.qml PX4RadioComponentSummary.qml
PX4TuningComponentVTOL.qml PX4SimpleFlightModes.qml
PowerComponent.qml PX4TuningComponentCopter.qml
PowerComponentSummary.qml PX4TuningComponentPlane.qml
SafetyComponent.qml PX4TuningComponentVTOL.qml
SafetyComponentSummary.qml SafetyComponent.qml
SensorsComponent.qml SafetyComponentSummary.qml
SensorsComponentSummary.qml SensorsComponent.qml
SensorsComponentSummaryFixedWing.qml SensorsComponentSummaryFixedWing.qml
SensorsSetup.qml SensorsComponentSummary.qml
) SensorsSetup.qml
)

8
src/CMakeLists.txt
Unescape View File

@ -54,13 +54,13 @@ if(BUILD_TESTING)
add_qgc_test(CorridorScanComplexItemTest) add_qgc_test(CorridorScanComplexItemTest)
add_qgc_test(FactSystemTestGeneric) add_qgc_test(FactSystemTestGeneric)
add_qgc_test(FactSystemTestPX4) add_qgc_test(FactSystemTestPX4)
add_qgc_test(FileDialogTest) #add_qgc_test(FileDialogTest)
add_qgc_test(FileManagerTest) #add_qgc_test(FileManagerTest)
add_qgc_test(FlightGearUnitTest) add_qgc_test(FlightGearUnitTest)
add_qgc_test(GeoTest) add_qgc_test(GeoTest)
add_qgc_test(LinkManagerTest) add_qgc_test(LinkManagerTest)
add_qgc_test(LogDownloadTest) add_qgc_test(LogDownloadTest)
add_qgc_test(MessageBoxTest) #add_qgc_test(MessageBoxTest)
add_qgc_test(MissionCommandTreeTest) add_qgc_test(MissionCommandTreeTest)
add_qgc_test(MissionControllerTest) add_qgc_test(MissionControllerTest)
add_qgc_test(MissionItemTest) add_qgc_test(MissionItemTest)
@ -70,7 +70,7 @@ if(BUILD_TESTING)
add_qgc_test(PlanMasterControllerTest) add_qgc_test(PlanMasterControllerTest)
add_qgc_test(QGCMapPolygonTest) add_qgc_test(QGCMapPolygonTest)
add_qgc_test(QGCMapPolylineTest) add_qgc_test(QGCMapPolylineTest)
add_qgc_test(RadioConfigTest) #add_qgc_test(RadioConfigTest)
add_qgc_test(SendMavCommandTest) add_qgc_test(SendMavCommandTest)
add_qgc_test(SimpleMissionItemTest) add_qgc_test(SimpleMissionItemTest)
add_qgc_test(SpeedSectionTest) add_qgc_test(SpeedSectionTest)

13
src/FactSystem/CMakeLists.txt
Unescape View File

@ -5,20 +5,33 @@ set(EXTRA_SRC)
if(BUILD_TESTING) if(BUILD_TESTING)
list(APPEND EXTRA_SRC list(APPEND EXTRA_SRC
FactSystemTestBase.cc FactSystemTestBase.cc
FactSystemTestBase.h
FactSystemTestGeneric.cc FactSystemTestGeneric.cc
FactSystemTestGeneric.h
FactSystemTestPX4.cc FactSystemTestPX4.cc
FactSystemTestPX4.h
ParameterManagerTest.cc ParameterManagerTest.cc
ParameterManagerTest.h
) )
endif() endif()
add_library(FactSystem add_library(FactSystem
Fact.cc Fact.cc
FactGroup.cc FactGroup.cc
FactGroup.h
Fact.h
FactMetaData.cc FactMetaData.cc
FactMetaData.h
FactSystem.cc FactSystem.cc
FactSystem.h
FactValueSliderListModel.cc FactValueSliderListModel.cc
FactValueSliderListModel.h
ParameterManager.cc ParameterManager.cc
ParameterManager.h
SettingsFact.cc SettingsFact.cc
SettingsFact.h
FactSystemTest.qml
${EXTRA_SRC} ${EXTRA_SRC}
) )

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

@ -3,17 +3,18 @@ add_library(FactControls
) )
add_custom_target(FactControlsQml add_custom_target(FactControlsQml
SOURCES SOURCES
AltitudeFactTextField.qml FactPanelController.h
FactCheckBox.qml AltitudeFactTextField.qml
FactLabel.qml FactBitmask.qml
FactTextField.qml FactCheckBox.qml
FactTextFieldSlider.qml FactComboBox.qml
FactBitmask.qml FactLabel.qml
FactComboBox.qml FactTextFieldGrid.qml
FactTextFieldGrid.qml FactTextField.qml
FactTextFieldRow.qml FactTextFieldRow.qml
FactValueSlider.qml FactTextFieldSlider.qml
FactValueSlider.qml
) )
target_link_libraries(FactControls qgc) target_link_libraries(FactControls qgc)

2
src/FlightDisplay/CMakeLists.txt
Unescape View File

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

2
src/FlightMap/CMakeLists.txt
Unescape View File

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

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

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

17
src/MissionManager/CMakeLists.txt
Unescape View File

@ -10,6 +10,10 @@ if(BUILD_TESTING)
CorridorScanComplexItemTest.h CorridorScanComplexItemTest.h
FWLandingPatternTest.cc FWLandingPatternTest.cc
FWLandingPatternTest.h FWLandingPatternTest.h
LandingComplexItemTest.cc
LandingComplexItemTest.h
MissionCommandTreeEditorTest.cc
MissionCommandTreeEditorTest.h
MissionCommandTreeTest.cc MissionCommandTreeTest.cc
MissionCommandTreeTest.h MissionCommandTreeTest.h
MissionControllerManagerTest.cc MissionControllerManagerTest.cc
@ -38,10 +42,10 @@ if(BUILD_TESTING)
StructureScanComplexItemTest.h StructureScanComplexItemTest.h
SurveyComplexItemTest.cc SurveyComplexItemTest.cc
SurveyComplexItemTest.h SurveyComplexItemTest.h
TransectStyleComplexItemTest.cc
TransectStyleComplexItemTest.h
TransectStyleComplexItemTestBase.cc TransectStyleComplexItemTestBase.cc
TransectStyleComplexItemTestBase.h TransectStyleComplexItemTestBase.h
TransectStyleComplexItemTest.cc
TransectStyleComplexItemTest.h
VisualMissionItemTest.cc VisualMissionItemTest.cc
VisualMissionItemTest.h VisualMissionItemTest.h
) )
@ -105,11 +109,12 @@ add_library(MissionManager
QGCMapPolyline.cc QGCMapPolyline.cc
QGCMapPolyline.h QGCMapPolyline.h
RallyPoint.cc RallyPoint.cc
RallyPoint.h
RallyPointController.cc RallyPointController.cc
RallyPointController.h RallyPointController.h
RallyPoint.h
RallyPointManager.cc RallyPointManager.cc
RallyPointManager.h RallyPointManager.h
Section.h
SimpleMissionItem.cc SimpleMissionItem.cc
SimpleMissionItem.h SimpleMissionItem.h
SpeedSection.cc SpeedSection.cc
@ -138,8 +143,10 @@ add_library(MissionManager
add_custom_Target(MisionManagerQml add_custom_Target(MisionManagerQml
SOURCES SOURCES
QGCMapCircleVisuals.qml MapLineArrow.qml
QGCMapPolygonVisuals.qml MissionCommandTreeEditorTestWindow.qml
QGCMapCircleVisuals.qml
QGCMapPolygonVisuals.qml
QGCMapPolylineVisuals.qml QGCMapPolylineVisuals.qml
) )

6
src/PlanView/CMakeLists.txt
Unescape View File

@ -26,7 +26,13 @@ add_custom_target(PlanViewQml
StructureScanMapVisual.qml StructureScanMapVisual.qml
SurveyItemEditor.qml SurveyItemEditor.qml
SurveyMapVisual.qml SurveyMapVisual.qml
TakeoffItemMapVisual.qml
TerrainStatus.qml
TransectStyleComplexItemStats.qml TransectStyleComplexItemStats.qml
TransectStyleComplexItemTabBar.qml
TransectStyleComplexItemTerrainFollow.qml
TransectStyleMapVisuals.qml TransectStyleMapVisuals.qml
VTOLLandingPatternEditor.qml
VTOLLandingPatternMapVisual.qml
) )

12
src/QmlControls/CMakeLists.txt
Unescape View File

@ -55,7 +55,6 @@ add_custom_target(QmlControlsQml
FlightModeDropdown.qml FlightModeDropdown.qml
FlightModeMenu.qml FlightModeMenu.qml
HackAndroidFileDialog.qml HackAndroidFileDialog.qml
HackFileDialog.qml
HeightIndicator.qml HeightIndicator.qml
HorizontalFactValueGrid.qml HorizontalFactValueGrid.qml
IndicatorButton.qml IndicatorButton.qml
@ -74,8 +73,9 @@ add_custom_target(QmlControlsQml
ModeSwitchDisplay.qml ModeSwitchDisplay.qml
MultiRotorMotorDisplay.qml MultiRotorMotorDisplay.qml
OfflineMapButton.qml OfflineMapButton.qml
ParameterEditor.qml ParameterDiffDialog.qml
ParameterEditorDialog.qml ParameterEditorDialog.qml
ParameterEditor.qml
PIDTuning.qml PIDTuning.qml
PreFlightCheckButton.qml PreFlightCheckButton.qml
PreFlightCheckGroup.qml PreFlightCheckGroup.qml
@ -88,24 +88,24 @@ add_custom_target(QmlControlsQml
QGCControlDebug.qml QGCControlDebug.qml
QGCDynamicObjectManager.qml QGCDynamicObjectManager.qml
QGCFileDialog.qml QGCFileDialog.qml
QGCFlickable.qml
QGCFlickableHorizontalIndicator.qml QGCFlickableHorizontalIndicator.qml
QGCFlickable.qml
QGCFlickableVerticalIndicator.qml QGCFlickableVerticalIndicator.qml
QGCGroupBox.qml QGCGroupBox.qml
QGCHoverButton.qml QGCHoverButton.qml
QGCLabel.qml QGCLabel.qml
QGCListView.qml QGCListView.qml
QGCMapLabel.qml QGCMapLabel.qml
QGCMenu.qml
QGCMenuItem.qml QGCMenuItem.qml
QGCMenu.qml
QGCMenuSeparator.qml QGCMenuSeparator.qml
QGCMouseArea.qml QGCMouseArea.qml
QGCMovableItem.qml QGCMovableItem.qml
QGCOptionsComboBox.qml QGCOptionsComboBox.qml
QGCPipOverlay.qml QGCPipOverlay.qml
QGCPipState.qml QGCPipState.qml
QGCPopupDialog.qml
QGCPopupDialogContainer.qml QGCPopupDialogContainer.qml
QGCPopupDialog.qml
QGCRadioButton.qml QGCRadioButton.qml
QGCSlider.qml QGCSlider.qml
QGCSwitch.qml QGCSwitch.qml
@ -114,8 +114,8 @@ add_custom_target(QmlControlsQml
QGCTextField.qml QGCTextField.qml
QGCToolBarButton.qml QGCToolBarButton.qml
QGCToolInsets.qml QGCToolInsets.qml
QGCViewDialog.qml
QGCViewDialogContainer.qml QGCViewDialogContainer.qml
QGCViewDialog.qml
QGCViewMessage.qml QGCViewMessage.qml
QmlTest.qml QmlTest.qml
RCChannelMonitor.qml RCChannelMonitor.qml

4
src/Vehicle/CMakeLists.txt
Unescape View File

@ -4,14 +4,14 @@ if(BUILD_TESTING)
list(APPEND EXTRA_SRC list(APPEND EXTRA_SRC
FTPManagerTest.cc FTPManagerTest.cc
FTPManagerTest.h FTPManagerTest.h
InitialConnectTest.cc
InitialConnectTest.h
RequestMessageTest.cc RequestMessageTest.cc
RequestMessageTest.h RequestMessageTest.h
SendMavCommandWithHandlerTest.cc SendMavCommandWithHandlerTest.cc
SendMavCommandWithHandlerTest.h SendMavCommandWithHandlerTest.h
SendMavCommandWithSignallingTest.cc SendMavCommandWithSignallingTest.cc
SendMavCommandWithSignallingTest.h SendMavCommandWithSignallingTest.h
VehicleLinkManagerTest.cc
VehicleLinkManagerTest.h
) )
endif() endif()

28
src/VehicleSetup/CMakeLists.txt
Unescape View File

@ -1,25 +1,31 @@
add_library(VehicleSetup add_library(VehicleSetup
Bootloader.cc Bootloader.cc
Bootloader.h
FirmwareImage.cc FirmwareImage.cc
FirmwareImage.h
FirmwareUpgradeController.cc FirmwareUpgradeController.cc
FirmwareUpgradeController.h
JoystickConfigController.cc JoystickConfigController.cc
JoystickConfigController.h
PX4FirmwareUpgradeThread.cc PX4FirmwareUpgradeThread.cc
PX4FirmwareUpgradeThread.h
VehicleComponent.cc VehicleComponent.cc
VehicleComponent.h
) )
add_custom_target(VehicleSetupQml add_custom_target(VehicleSetupQml
SOURCES SOURCES
JoystickConfigCalibration.qml FirmwareUpgrade.qml
JoystickConfigGeneral.qml JoystickConfigAdvanced.qml
SetupParameterEditor.qml JoystickConfigButtons.qml
VehicleSummary.qml JoystickConfigCalibration.qml
JoystickConfigButtons.qml JoystickConfigGeneral.qml
PX4FlowSensor.qml JoystickConfig.qml
FirmwareUpgrade.qml PX4FlowSensor.qml
JoystickConfig.qml SetupParameterEditor.qml
JoystickConfigAdvanced.qml SetupView.qml
SetupView.qml VehicleSummary.qml
) )
target_link_libraries(VehicleSetup target_link_libraries(VehicleSetup

9
src/comm/MockLink.cc
Unescape View File

@ -436,7 +436,9 @@ void MockLink::_sendBatteryStatus(void)
_battery1PctRemaining, _battery1PctRemaining,
_battery1TimeRemaining, _battery1TimeRemaining,
_battery1ChargeState, _battery1ChargeState,
rgVoltagesExtNone); rgVoltagesExtNone,
0, // MAV_BATTERY_MODE
0); // MAV_BATTERY_FAULT
respondWithMavlinkMessage(msg); respondWithMavlinkMessage(msg);
mavlink_msg_battery_status_pack_chan( mavlink_msg_battery_status_pack_chan(
@ -455,7 +457,10 @@ void MockLink::_sendBatteryStatus(void)
_battery2PctRemaining, _battery2PctRemaining,
_battery2TimeRemaining, _battery2TimeRemaining,
_battery2ChargeState, _battery2ChargeState,
rgVoltagesExtNone); rgVoltagesExtNone,
0, // MAV_BATTERY_MODE
0); // MAV_BATTERY_FAULT
respondWithMavlinkMessage(msg); respondWithMavlinkMessage(msg);
} }

15
src/qgcunittest/CMakeLists.txt
Unescape View File

@ -1,18 +1,25 @@
add_library(qgcunittest add_library(qgcunittest
#FileDialogTest.cc #FileDialogTest.cc
#FileDialogTest.h
#FileManagerTest.cc #FileManagerTest.cc
#FlightGearTest.cc #FileManagerTest.h
GeoTest.cc GeoTest.cc
LinkManagerTest.cc GeoTest.h
#MainWindowTest.cc #MainWindowTest.cc
#MainWindowTest.h
MavlinkLogTest.cc MavlinkLogTest.cc
MavlinkLogTest.h
#MessageBoxTest.cc #MessageBoxTest.cc
#MessageBoxTest.h
MultiSignalSpy.cc MultiSignalSpy.cc
MultiSignalSpy.h
MultiSignalSpyV2.cc
MultiSignalSpyV2.h
#RadioConfigTest.cc #RadioConfigTest.cc
TCPLinkTest.cc #RadioConfigTest.h
TCPLoopBackServer.cc
UnitTest.cc UnitTest.cc
UnitTest.h
UnitTestList.cc UnitTestList.cc
) )

Write Preview
Loading…
Cancel
Save