From b793cc129595b1b7a4331fb8620dda02cbd4a0af Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Fri, 16 Aug 2019 16:10:37 +0200 Subject: [PATCH] CMake: Add Qml targets to Ui --- src/ui/CMakeLists.txt | 9 +++++++++ src/ui/preferences/CMakeLists.txt | 15 +++++++++++++++ src/ui/toolbar/CMakeLists.txt | 18 ++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 src/ui/preferences/CMakeLists.txt create mode 100644 src/ui/toolbar/CMakeLists.txt diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index edef4d518..8635a2b6a 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -1,3 +1,5 @@ +add_subdirectory(preferences) +add_subdirectory(toolbar) add_library(ui @@ -19,6 +21,13 @@ add_library(ui QMap3D.ui ) +add_custom_target(uiQml +SOURCES + AppSettings.qml + ExitWithErrorWindow.qml + MainRootWindow.qml +) + target_link_libraries(ui PUBLIC qgc diff --git a/src/ui/preferences/CMakeLists.txt b/src/ui/preferences/CMakeLists.txt new file mode 100644 index 000000000..a5a717c75 --- /dev/null +++ b/src/ui/preferences/CMakeLists.txt @@ -0,0 +1,15 @@ +add_custom_target(UiPreferencesQml +SOURCES + SerialSettings.qml + HelpSettings.qml + TcpSettings.qml + MavlinkSettings.qml + DebugWindow.qml + UdpSettings.qml + LinkSettings.qml + MockLink.qml + GeneralSettings.qml + BluetoothSettings.qml + LogReplaySettings.qml + MockLinkSettings.qml +) \ No newline at end of file diff --git a/src/ui/toolbar/CMakeLists.txt b/src/ui/toolbar/CMakeLists.txt new file mode 100644 index 000000000..b23df04be --- /dev/null +++ b/src/ui/toolbar/CMakeLists.txt @@ -0,0 +1,18 @@ +add_custom_target(UiToolbarQml +SOURCES + ArmedIndicator.qml + BatteryIndicator.qml + GPSIndicator.qml + GPSRTKIndicator.qml + JoystickIndicator.qml + LinkIndicator.qml + MainToolBar.qml + MainToolBarIndicators.qml + MessageIndicator.qml + ModeIndicator.qml + MultiVehicleSelector.qml + RCRSSIIndicator.qml + SignalStrength.qml + TelemetryRSSIIndicator.qml + VTOLModeIndicator.qml +) \ No newline at end of file -- 2.22.0