diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa13afedf6a543e349bb212e4d30a06a5e871736..a160c522268446026bc375bad3516f231e343728 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index cf4f3bf5480c24a9e0c0030e8c88bac44b8dbaf5..b1c28a17504c5169826ef83bc85c42da3d196d19 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -87,12 +87,12 @@
src/QmlControls/PageView.qml
src/QmlControls/ParameterEditor.qml
src/QmlControls/ParameterEditorDialog.qml
- src/QmlControls/PIDTuning.qml
+ src/QmlControls/PIDTuning.qml
src/PlanView/PlanToolBar.qml
- src/QmlControls/PreFlightCheckButton.qml
- src/QmlControls/PreFlightCheckGroup.qml
- src/QmlControls/PreFlightCheckList.qml
- src/QmlControls/PreFlightCheckModel.qml
+ src/QmlControls/PreFlightCheckButton.qml
+ src/QmlControls/PreFlightCheckGroup.qml
+ src/QmlControls/PreFlightCheckList.qml
+ src/QmlControls/PreFlightCheckModel.qml
src/QmlControls/QGCButton.qml
src/QmlControls/QGCCheckBox.qml
src/QmlControls/QGCColoredImage.qml
@@ -156,12 +156,12 @@
src/FlightDisplay/GuidedActionsController.qml
src/FlightDisplay/GuidedAltitudeSlider.qml
src/FlightDisplay/MultiVehicleList.qml
- src/FlightDisplay/PreFlightBatteryCheck.qml
- src/FlightDisplay/BuiltInPreFlightCheckModel.qml
- src/FlightDisplay/PreFlightGPSCheck.qml
- src/FlightDisplay/PreFlightRCCheck.qml
- src/FlightDisplay/PreFlightSensorsHealthCheck.qml
- src/FlightDisplay/PreFlightSoundCheck.qml
+ src/FlightDisplay/PreFlightBatteryCheck.qml
+ src/FlightDisplay/BuiltInPreFlightCheckModel.qml
+ src/FlightDisplay/PreFlightGPSCheck.qml
+ src/FlightDisplay/PreFlightRCCheck.qml
+ src/FlightDisplay/PreFlightSensorsHealthCheck.qml
+ src/FlightDisplay/PreFlightSoundCheck.qml
src/FlightDisplay/qmldir
src/FlightMap/MapItems/CameraTriggerIndicator.qml
src/FlightMap/Widgets/CenterMapDropButton.qml
diff --git a/src/Audio/CMakeLists.txt b/src/Audio/CMakeLists.txt
index a6d6599639770793d9f38cb0a0327d49b30f58c7..973b1c9b4ce110254d094f6d7e6ed82ca3c2bcb0 100644
--- a/src/Audio/CMakeLists.txt
+++ b/src/Audio/CMakeLists.txt
@@ -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()
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7550244463f90cbc6e7682efdc2437c512eefc02..19c808bbd11e0b0d03da846686dece569d3a1742 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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)
add_qgc_test(TCPLinkTest)
add_qgc_test(TransectStyleComplexItemTest)
- list(APPEND QGC_RESOURCES
- UnitTest.qrc
- )
endif()
add_library(qgc
diff --git a/src/FirmwarePlugin/APM/APMResources.qrc b/src/FirmwarePlugin/APM/APMResources.qrc
index 19da1d9dafff383c4c8119ed8399f00738389be9..b5e6a40e6b062df306a886a6118f44eb1356cfeb 100644
--- a/src/FirmwarePlugin/APM/APMResources.qrc
+++ b/src/FirmwarePlugin/APM/APMResources.qrc
@@ -50,7 +50,7 @@
APMParameterFactMetaData.Copter.3.6.xml
APMParameterFactMetaData.Rover.3.0.xml
APMParameterFactMetaData.Rover.3.2.xml
- APMParameterFactMetaData.Rover.3.4.xml
+ APMParameterFactMetaData.Rover.3.4.xml
APMParameterFactMetaData.Sub.3.4.xml
APMParameterFactMetaData.Sub.3.5.xml
APMParameterFactMetaData.Sub.3.6dev.xml
diff --git a/src/FirmwarePlugin/CMakeLists.txt b/src/FirmwarePlugin/CMakeLists.txt
index d772698714d461f0e0e8feea36c63463c05326c6..15d11e2cc7150955a90126fe623dc742bd4e9502 100644
--- a/src/FirmwarePlugin/CMakeLists.txt
+++ b/src/FirmwarePlugin/CMakeLists.txt
@@ -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
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
)