cmake testing updates

CMakeLists.txt

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

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()
+

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

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,27 +11,21 @@ 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
 	)