From a8baec09de835438d181e9d9d5a5f097838bbbbf Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Thu, 25 Oct 2018 14:21:54 -0400
Subject: [PATCH] cmake create FirmwarePlugin library in src/FirmwarePlugin

---
 src/CMakeLists.txt                | 23 +++------------------
 src/FirmwarePlugin/CMakeLists.txt | 34 +++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 20 deletions(-)
 create mode 100644 src/FirmwarePlugin/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2c684ba62..0ca4c333f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,8 +10,6 @@ include_directories(
 	Camera
 	FactSystem
 	FactSystem/FactControls
-	FirmwarePlugin
-	FirmwarePlugin/APM
 	FlightDisplay
 	FlightMap/Widgets
 	FollowMe
@@ -145,8 +143,7 @@ endif()
 
 set(QGC_RESOURCES)
 list(APPEND QGC_RESOURCES
-	FirmwarePlugin/APM/APMResources.qrc
-	FirmwarePlugin/PX4/PX4Resources.qrc
+
 )
 
 if(BUILD_TESTING)
@@ -181,22 +178,6 @@ add_library(qgc
 	FactSystem/ParameterManager.cc
 	FactSystem/SettingsFact.cc
 
-	FirmwarePlugin/APM/APMFirmwarePlugin.cc
-	FirmwarePlugin/APM/APMFirmwarePluginFactory.cc
-	FirmwarePlugin/APM/APMParameterMetaData.cc
-	FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc
-	FirmwarePlugin/APM/ArduPlaneFirmwarePlugin.cc
-	FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc
-	FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
-
-	FirmwarePlugin/CameraMetaData.cc
-	FirmwarePlugin/FirmwarePlugin.cc
-	FirmwarePlugin/FirmwarePluginManager.cc
-
-	FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
-	FirmwarePlugin/PX4/PX4FirmwarePluginFactory.cc
-	FirmwarePlugin/PX4/PX4ParameterMetaData.cc
-
 	FlightDisplay/VideoManager.cc
 
 	FlightMap/Widgets/ValuesWidgetController.cc
@@ -316,6 +297,7 @@ add_subdirectory(api)
 add_subdirectory(Audio)
 add_subdirectory(AutoPilotPlugins)
 add_subdirectory(comm)
+add_subdirectory(FirmwarePlugin)
 add_subdirectory(GPS)
 add_subdirectory(MissionManager)
 
@@ -345,6 +327,7 @@ target_link_libraries(qgc
 	Audio
 	AutoPilotPlugins
 	comm
+	FirmwarePlugin
 	gps
 	qwt # LinechartWidget
 	MissionManager
diff --git a/src/FirmwarePlugin/CMakeLists.txt b/src/FirmwarePlugin/CMakeLists.txt
new file mode 100644
index 000000000..d77269871
--- /dev/null
+++ b/src/FirmwarePlugin/CMakeLists.txt
@@ -0,0 +1,34 @@
+
+add_library(FirmwarePlugin
+	APM/APMFirmwarePlugin.cc
+	APM/APMFirmwarePluginFactory.cc
+	APM/APMParameterMetaData.cc
+	APM/ArduCopterFirmwarePlugin.cc
+	APM/ArduPlaneFirmwarePlugin.cc
+	APM/ArduRoverFirmwarePlugin.cc
+	APM/ArduSubFirmwarePlugin.cc
+
+	CameraMetaData.cc
+	FirmwarePlugin.cc
+	FirmwarePluginManager.cc
+
+	PX4/PX4FirmwarePlugin.cc
+	PX4/PX4FirmwarePluginFactory.cc
+	PX4/PX4ParameterMetaData.cc
+
+	# Resources
+	APM/APMResources.qrc
+	PX4/PX4Resources.qrc
+)
+
+target_link_libraries(FirmwarePlugin
+	PUBLIC
+		qgc
+)
+
+target_include_directories(FirmwarePlugin
+	PUBLIC
+		${CMAKE_CURRENT_SOURCE_DIR}
+		APM
+	)
+
-- 
2.22.0