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

cmake testing updates

QGC4.4
Daniel Agar 6 years ago
parent
f767cc3f80
commit
223e3dcd48
6 changed files with 41 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      CMakeLists.txt
  2. 22
      qgroundcontrol.qrc
  3. 4
      src/Audio/CMakeLists.txt
  4. 4
      src/CMakeLists.txt
  5. 2
      src/FirmwarePlugin/APM/APMResources.qrc
  6. 18
      src/FirmwarePlugin/CMakeLists.txt

28
CMakeLists.txt
Unescape View File

@ -180,21 +180,27 @@ include_directories( @@ -180,21 +180,27 @@ include_directories(
add_subdirectory(libs)
add_subdirectory(src)
set(QGC_RESOURCES
#HackAndroidFileDialog.qrc
HackFileDialog.qrc
qgcresources.qrc
qgroundcontrol.qrc
)
if(BUILD_TESTING)
list(APPEND QGC_RESOURCES
UnitTest.qrc
)
endif()
if(ANDROID)
add_library(QGroundControl SHARED)
add_library(QGroundControl SHARED ${QGC_RESOURCES})
else()
add_executable(QGroundControl
#HackAndroidFileDialog.qrc
HackFileDialog.qrc
qgcresources.qrc
qgroundcontrol.qrc
)
add_executable(QGroundControl ${QGC_RESOURCES}
)
endif()
target_link_libraries(QGroundControl
PUBLIC
qgc
)
target_link_libraries(QGroundControl PUBLIC qgc)
if(NOT QT_MKSPEC MATCHES "winrt")
target_link_libraries(QGroundControl

22
qgroundcontrol.qrc
Unescape View File

@ -87,12 +87,12 @@ @@ -87,12 +87,12 @@
<file alias="QGroundControl/Controls/PageView.qml">src/QmlControls/PageView.qml</file>
<file alias="QGroundControl/Controls/ParameterEditor.qml">src/QmlControls/ParameterEditor.qml</file>
<file alias="QGroundControl/Controls/ParameterEditorDialog.qml">src/QmlControls/ParameterEditorDialog.qml</file>
<file alias="QGroundControl/Controls/PIDTuning.qml">src/QmlControls/PIDTuning.qml</file>
<file alias="QGroundControl/Controls/PIDTuning.qml">src/QmlControls/PIDTuning.qml</file>
<file alias="QGroundControl/Controls/PlanToolBar.qml">src/PlanView/PlanToolBar.qml</file>
<file alias="QGroundControl/Controls/PreFlightCheckButton.qml">src/QmlControls/PreFlightCheckButton.qml</file>
<file alias="QGroundControl/Controls/PreFlightCheckGroup.qml">src/QmlControls/PreFlightCheckGroup.qml</file>
<file alias="QGroundControl/Controls/PreFlightCheckList.qml">src/QmlControls/PreFlightCheckList.qml</file>
<file alias="QGroundControl/Controls/PreFlightCheckModel.qml">src/QmlControls/PreFlightCheckModel.qml</file>
<file alias="QGroundControl/Controls/PreFlightCheckButton.qml">src/QmlControls/PreFlightCheckButton.qml</file>
<file alias="QGroundControl/Controls/PreFlightCheckGroup.qml">src/QmlControls/PreFlightCheckGroup.qml</file>
<file alias="QGroundControl/Controls/PreFlightCheckList.qml">src/QmlControls/PreFlightCheckList.qml</file>
<file alias="QGroundControl/Controls/PreFlightCheckModel.qml">src/QmlControls/PreFlightCheckModel.qml</file>
<file alias="QGroundControl/Controls/QGCButton.qml">src/QmlControls/QGCButton.qml</file>
<file alias="QGroundControl/Controls/QGCCheckBox.qml">src/QmlControls/QGCCheckBox.qml</file>
<file alias="QGroundControl/Controls/QGCColoredImage.qml">src/QmlControls/QGCColoredImage.qml</file>
@ -156,12 +156,12 @@ @@ -156,12 +156,12 @@
<file alias="QGroundControl/FlightDisplay/GuidedActionsController.qml">src/FlightDisplay/GuidedActionsController.qml</file>
<file alias="QGroundControl/FlightDisplay/GuidedAltitudeSlider.qml">src/FlightDisplay/GuidedAltitudeSlider.qml</file>
<file alias="QGroundControl/FlightDisplay/MultiVehicleList.qml">src/FlightDisplay/MultiVehicleList.qml</file>
<file alias="QGroundControl/FlightDisplay/PreFlightBatteryCheck.qml">src/FlightDisplay/PreFlightBatteryCheck.qml</file>
<file alias="QGroundControl/FlightDisplay/BuiltInPreFlightCheckModel.qml">src/FlightDisplay/BuiltInPreFlightCheckModel.qml</file>
<file alias="QGroundControl/FlightDisplay/PreFlightGPSCheck.qml">src/FlightDisplay/PreFlightGPSCheck.qml</file>
<file alias="QGroundControl/FlightDisplay/PreFlightRCCheck.qml">src/FlightDisplay/PreFlightRCCheck.qml</file>
<file alias="QGroundControl/FlightDisplay/PreFlightSensorsHealthCheck.qml">src/FlightDisplay/PreFlightSensorsHealthCheck.qml</file>
<file alias="QGroundControl/FlightDisplay/PreFlightSoundCheck.qml">src/FlightDisplay/PreFlightSoundCheck.qml</file>
<file alias="QGroundControl/FlightDisplay/PreFlightBatteryCheck.qml">src/FlightDisplay/PreFlightBatteryCheck.qml</file>
<file alias="QGroundControl/FlightDisplay/BuiltInPreFlightCheckModel.qml">src/FlightDisplay/BuiltInPreFlightCheckModel.qml</file>
<file alias="QGroundControl/FlightDisplay/PreFlightGPSCheck.qml">src/FlightDisplay/PreFlightGPSCheck.qml</file>
<file alias="QGroundControl/FlightDisplay/PreFlightRCCheck.qml">src/FlightDisplay/PreFlightRCCheck.qml</file>
<file alias="QGroundControl/FlightDisplay/PreFlightSensorsHealthCheck.qml">src/FlightDisplay/PreFlightSensorsHealthCheck.qml</file>
<file alias="QGroundControl/FlightDisplay/PreFlightSoundCheck.qml">src/FlightDisplay/PreFlightSoundCheck.qml</file>
<file alias="QGroundControl/FlightDisplay/qmldir">src/FlightDisplay/qmldir</file>
<file alias="QGroundControl/FlightMap/CameraTriggerIndicator.qml">src/FlightMap/MapItems/CameraTriggerIndicator.qml</file>
<file alias="QGroundControl/FlightMap/CenterMapDropButton.qml">src/FlightMap/Widgets/CenterMapDropButton.qml</file>

4
src/Audio/CMakeLists.txt
Unescape View File

@ -23,3 +23,7 @@ target_link_libraries(Audio @@ -23,3 +23,7 @@ target_link_libraries(Audio
target_include_directories(Audio PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
if(BUILD_TESTING)
add_qgc_test(AudioOutputTest)
endif()

4
src/CMakeLists.txt
Unescape View File

@ -31,7 +31,6 @@ if(BUILD_TESTING) @@ -31,7 +31,6 @@ if(BUILD_TESTING)
add_subdirectory(qgcunittest)
add_qgc_test(AudioOutputTest)
add_qgc_test(CameraCalcTest)
add_qgc_test(CameraSectionTest)
add_qgc_test(CorridorScanComplexItemTest)
@ -62,9 +61,6 @@ if(BUILD_TESTING) @@ -62,9 +61,6 @@ if(BUILD_TESTING)
add_qgc_test(TCPLinkTest)
add_qgc_test(TransectStyleComplexItemTest)
list(APPEND QGC_RESOURCES
UnitTest.qrc
)
endif()
add_library(qgc

2
src/FirmwarePlugin/APM/APMResources.qrc
Unescape View File

@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
<file alias="APMParameterFactMetaData.Copter.3.6.xml">APMParameterFactMetaData.Copter.3.6.xml</file>
<file alias="APMParameterFactMetaData.Rover.3.0.xml">APMParameterFactMetaData.Rover.3.0.xml</file>
<file alias="APMParameterFactMetaData.Rover.3.2.xml">APMParameterFactMetaData.Rover.3.2.xml</file>
<file alias="APMParameterFactMetaData.Rover.3.4.xml">APMParameterFactMetaData.Rover.3.4.xml</file>
<file alias="APMParameterFactMetaData.Rover.3.4.xml">APMParameterFactMetaData.Rover.3.4.xml</file>
<file alias="APMParameterFactMetaData.Sub.3.4.xml">APMParameterFactMetaData.Sub.3.4.xml</file>
<file alias="APMParameterFactMetaData.Sub.3.5.xml">APMParameterFactMetaData.Sub.3.5.xml</file>
<file alias="APMParameterFactMetaData.Sub.3.6dev.xml">APMParameterFactMetaData.Sub.3.6dev.xml</file>

18
src/FirmwarePlugin/CMakeLists.txt
Unescape View File

@ -1,5 +1,9 @@ @@ -1,5 +1,9 @@
add_library(FirmwarePlugin
CameraMetaData.cc
FirmwarePlugin.cc
FirmwarePluginManager.cc
APM/APMFirmwarePlugin.cc
APM/APMFirmwarePluginFactory.cc
APM/APMParameterMetaData.cc
@ -7,28 +11,22 @@ add_library(FirmwarePlugin @@ -7,28 +11,22 @@ add_library(FirmwarePlugin
APM/ArduPlaneFirmwarePlugin.cc
APM/ArduRoverFirmwarePlugin.cc
APM/ArduSubFirmwarePlugin.cc
CameraMetaData.cc
FirmwarePlugin.cc
FirmwarePluginManager.cc
APM/APMResources.qrc
PX4/PX4FirmwarePlugin.cc
PX4/PX4FirmwarePluginFactory.cc
PX4/PX4ParameterMetaData.cc
# Resources
APM/APMResources.qrc
PX4/PX4Resources.qrc
)
target_link_libraries(FirmwarePlugin
PUBLIC
PRIVATE
qgc
)
target_include_directories(FirmwarePlugin
PUBLIC
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}
APM
APM
)

Write Preview
Loading…
Cancel
Save