Commit 223e3dcd authored by Daniel Agar's avatar Daniel Agar

cmake testing updates

parent f767cc3f
...@@ -180,21 +180,27 @@ include_directories( ...@@ -180,21 +180,27 @@ include_directories(
add_subdirectory(libs) add_subdirectory(libs)
add_subdirectory(src) 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) if(ANDROID)
add_library(QGroundControl SHARED) add_library(QGroundControl SHARED ${QGC_RESOURCES})
else() else()
add_executable(QGroundControl add_executable(QGroundControl ${QGC_RESOURCES}
#HackAndroidFileDialog.qrc )
HackFileDialog.qrc
qgcresources.qrc
qgroundcontrol.qrc
)
endif() endif()
target_link_libraries(QGroundControl target_link_libraries(QGroundControl PUBLIC qgc)
PUBLIC
qgc
)
if(NOT QT_MKSPEC MATCHES "winrt") if(NOT QT_MKSPEC MATCHES "winrt")
target_link_libraries(QGroundControl target_link_libraries(QGroundControl
......
...@@ -87,12 +87,12 @@ ...@@ -87,12 +87,12 @@
<file alias="QGroundControl/Controls/PageView.qml">src/QmlControls/PageView.qml</file> <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/ParameterEditor.qml">src/QmlControls/ParameterEditor.qml</file>
<file alias="QGroundControl/Controls/ParameterEditorDialog.qml">src/QmlControls/ParameterEditorDialog.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/PlanToolBar.qml">src/PlanView/PlanToolBar.qml</file>
<file alias="QGroundControl/Controls/PreFlightCheckButton.qml">src/QmlControls/PreFlightCheckButton.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/PreFlightCheckGroup.qml">src/QmlControls/PreFlightCheckGroup.qml</file>
<file alias="QGroundControl/Controls/PreFlightCheckList.qml">src/QmlControls/PreFlightCheckList.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/PreFlightCheckModel.qml">src/QmlControls/PreFlightCheckModel.qml</file>
<file alias="QGroundControl/Controls/QGCButton.qml">src/QmlControls/QGCButton.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/QGCCheckBox.qml">src/QmlControls/QGCCheckBox.qml</file>
<file alias="QGroundControl/Controls/QGCColoredImage.qml">src/QmlControls/QGCColoredImage.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/GuidedActionsController.qml">src/FlightDisplay/GuidedActionsController.qml</file>
<file alias="QGroundControl/FlightDisplay/GuidedAltitudeSlider.qml">src/FlightDisplay/GuidedAltitudeSlider.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/MultiVehicleList.qml">src/FlightDisplay/MultiVehicleList.qml</file>
<file alias="QGroundControl/FlightDisplay/PreFlightBatteryCheck.qml">src/FlightDisplay/PreFlightBatteryCheck.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/BuiltInPreFlightCheckModel.qml">src/FlightDisplay/BuiltInPreFlightCheckModel.qml</file>
<file alias="QGroundControl/FlightDisplay/PreFlightGPSCheck.qml">src/FlightDisplay/PreFlightGPSCheck.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/PreFlightRCCheck.qml">src/FlightDisplay/PreFlightRCCheck.qml</file>
<file alias="QGroundControl/FlightDisplay/PreFlightSensorsHealthCheck.qml">src/FlightDisplay/PreFlightSensorsHealthCheck.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/PreFlightSoundCheck.qml">src/FlightDisplay/PreFlightSoundCheck.qml</file>
<file alias="QGroundControl/FlightDisplay/qmldir">src/FlightDisplay/qmldir</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/CameraTriggerIndicator.qml">src/FlightMap/MapItems/CameraTriggerIndicator.qml</file>
<file alias="QGroundControl/FlightMap/CenterMapDropButton.qml">src/FlightMap/Widgets/CenterMapDropButton.qml</file> <file alias="QGroundControl/FlightMap/CenterMapDropButton.qml">src/FlightMap/Widgets/CenterMapDropButton.qml</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}) target_include_directories(Audio PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
if(BUILD_TESTING)
add_qgc_test(AudioOutputTest)
endif()
...@@ -31,7 +31,6 @@ if(BUILD_TESTING) ...@@ -31,7 +31,6 @@ if(BUILD_TESTING)
add_subdirectory(qgcunittest) add_subdirectory(qgcunittest)
add_qgc_test(AudioOutputTest)
add_qgc_test(CameraCalcTest) add_qgc_test(CameraCalcTest)
add_qgc_test(CameraSectionTest) add_qgc_test(CameraSectionTest)
add_qgc_test(CorridorScanComplexItemTest) 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(TCPLinkTest)
add_qgc_test(TransectStyleComplexItemTest) add_qgc_test(TransectStyleComplexItemTest)
list(APPEND QGC_RESOURCES
UnitTest.qrc
)
endif() endif()
add_library(qgc add_library(qgc
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<file alias="APMParameterFactMetaData.Copter.3.6.xml">APMParameterFactMetaData.Copter.3.6.xml</file> <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.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.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.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.5.xml">APMParameterFactMetaData.Sub.3.5.xml</file>
<file alias="APMParameterFactMetaData.Sub.3.6dev.xml">APMParameterFactMetaData.Sub.3.6dev.xml</file> <file alias="APMParameterFactMetaData.Sub.3.6dev.xml">APMParameterFactMetaData.Sub.3.6dev.xml</file>
......
add_library(FirmwarePlugin add_library(FirmwarePlugin
CameraMetaData.cc
FirmwarePlugin.cc
FirmwarePluginManager.cc
APM/APMFirmwarePlugin.cc APM/APMFirmwarePlugin.cc
APM/APMFirmwarePluginFactory.cc APM/APMFirmwarePluginFactory.cc
APM/APMParameterMetaData.cc APM/APMParameterMetaData.cc
...@@ -7,28 +11,22 @@ add_library(FirmwarePlugin ...@@ -7,28 +11,22 @@ add_library(FirmwarePlugin
APM/ArduPlaneFirmwarePlugin.cc APM/ArduPlaneFirmwarePlugin.cc
APM/ArduRoverFirmwarePlugin.cc APM/ArduRoverFirmwarePlugin.cc
APM/ArduSubFirmwarePlugin.cc APM/ArduSubFirmwarePlugin.cc
APM/APMResources.qrc
CameraMetaData.cc
FirmwarePlugin.cc
FirmwarePluginManager.cc
PX4/PX4FirmwarePlugin.cc PX4/PX4FirmwarePlugin.cc
PX4/PX4FirmwarePluginFactory.cc PX4/PX4FirmwarePluginFactory.cc
PX4/PX4ParameterMetaData.cc PX4/PX4ParameterMetaData.cc
# Resources
APM/APMResources.qrc
PX4/PX4Resources.qrc PX4/PX4Resources.qrc
) )
target_link_libraries(FirmwarePlugin target_link_libraries(FirmwarePlugin
PUBLIC PRIVATE
qgc qgc
) )
target_include_directories(FirmwarePlugin target_include_directories(FirmwarePlugin
PUBLIC INTERFACE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
APM APM
) )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment