diff --git a/src/AutoPilotPlugins/APM/CMakeLists.txt b/src/AutoPilotPlugins/APM/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..565e54157a17e8a03271c16ebbb1a27689f468f9
--- /dev/null
+++ b/src/AutoPilotPlugins/APM/CMakeLists.txt
@@ -0,0 +1,35 @@
+add_custom_target(APMAutoPilotPluginQml
+SOURCES
+    APMAirframeComponent.qml
+    APMAirframeComponentSummary.qml
+    APMCameraComponent.qml
+    APMCameraComponentSummary.qml
+    APMCameraSubComponent.qml
+    APMFlightModesComponent.qml
+    APMFlightModesComponentSummary.qml
+    APMHeliComponent.qml
+    APMLightsComponent.qml
+    APMLightsComponentSummary.qml
+    APMNotSupported.qml
+    APMPowerComponent.qml
+    APMPowerComponentSummary.qml
+    APMRadioComponentSummary.qml
+    APMSafetyComponent.qml
+    APMSafetyComponentCopter.qml
+    APMSafetyComponentPlane.qml
+    APMSafetyComponentRover.qml
+    APMSafetyComponentSub.qml
+    APMSafetyComponentSummary.qml
+    APMSafetyComponentSummaryCopter.qml
+    APMSafetyComponentSummaryPlane.qml
+    APMSafetyComponentSummaryRover.qml
+    APMSafetyComponentSummarySub.qml
+    APMSensorsComponent.qml
+    APMSensorsComponentSummary.qml
+    APMSubFrameComponent.qml
+    APMSubFrameComponentSummary.qml
+    APMSubMotorComponent.qml
+    APMTuningComponentCopter.qml
+    APMTuningComponentSub.qml
+
+)
\ No newline at end of file
diff --git a/src/AutoPilotPlugins/CMakeLists.txt b/src/AutoPilotPlugins/CMakeLists.txt
index 9d27b5e061f7cb8a17ec41d644d4a57a546bfc12..2a3776e928a7147d0b5c67c56586e350a999a9cb 100644
--- a/src/AutoPilotPlugins/CMakeLists.txt
+++ b/src/AutoPilotPlugins/CMakeLists.txt
@@ -1,4 +1,8 @@
 
+add_subdirectory(APM)
+add_subdirectory(Common)
+add_subdirectory(PX4)
+
 add_library(AutoPilotPlugins
 	APM/APMAirframeComponent.cc
 	APM/APMAirframeComponentController.cc
diff --git a/src/AutoPilotPlugins/Common/CMakeLists.txt b/src/AutoPilotPlugins/Common/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..60f3e8382b9ec1740a202ab16fdc7ef16de69373
--- /dev/null
+++ b/src/AutoPilotPlugins/Common/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_custom_target(CommonAutoPilotPluginQml
+SOURCES
+    ESP8266Component.qml
+    ESP8266ComponentSummary.qml
+    MotorComponent.qml
+    RadioComponent.qml
+    SetupPage.qml
+    SyslinkComponent.qml
+)
\ No newline at end of file
diff --git a/src/AutoPilotPlugins/PX4/CMakeLists.txt b/src/AutoPilotPlugins/PX4/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fcd4ae40461a97a9dee6272a0c8334f97489ebe9
--- /dev/null
+++ b/src/AutoPilotPlugins/PX4/CMakeLists.txt
@@ -0,0 +1,23 @@
+add_custom_target(PX4AutoPilotPluginQml
+SOURCES
+    AirframeComponent.qml
+    AirframeComponentSummary.qml
+    CameraComponent.qml
+    CameraComponentSummary.qml
+    FlightModesComponentSummary.qml
+    PX4AdvancedFlightModes.qml
+    PX4FlightModes.qml
+    PX4RadioComponentSummary.qml
+    PX4SimpleFlightModes.qml
+    PX4TuningComponentCopter.qml
+    PX4TuningComponentPlane.qml
+    PX4TuningComponentVTOL.qml
+    PowerComponent.qml
+    PowerComponentSummary.qml
+    SafetyComponent.qml
+    SafetyComponentSummary.qml
+    SensorsComponent.qml
+    SensorsComponentSummary.qml
+    SensorsComponentSummaryFixedWing.qml
+    SensorsSetup.qml
+)
\ No newline at end of file