From 560fe6a151eaeb264fde238d1b6ad2bd6cd47758 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Fri, 16 Aug 2019 10:20:23 +0200 Subject: [PATCH] CMake: new target FactControls / FactControlsQml Create a new Target FactControls, and add a custom target for the Qml in the folder. --- src/FactSystem/CMakeLists.txt | 4 +++- src/FactSystem/FactControls/CMakeLists.txt | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 src/FactSystem/FactControls/CMakeLists.txt diff --git a/src/FactSystem/CMakeLists.txt b/src/FactSystem/CMakeLists.txt index 6b7f1999b..24bc8ccf8 100644 --- a/src/FactSystem/CMakeLists.txt +++ b/src/FactSystem/CMakeLists.txt @@ -1,4 +1,6 @@ +add_subdirectory(FactControls) + set(EXTRA_SRC) if(BUILD_TESTING) list(APPEND EXTRA_SRC @@ -11,7 +13,6 @@ endif() add_library(FactSystem Fact.cc - FactControls/FactPanelController.cc FactGroup.cc FactMetaData.cc FactSystem.cc @@ -25,6 +26,7 @@ add_library(FactSystem target_link_libraries(FactSystem PRIVATE qgc + FactControls ) target_include_directories(FactSystem diff --git a/src/FactSystem/FactControls/CMakeLists.txt b/src/FactSystem/FactControls/CMakeLists.txt new file mode 100644 index 000000000..c6d3c7f90 --- /dev/null +++ b/src/FactSystem/FactControls/CMakeLists.txt @@ -0,0 +1,19 @@ +add_library(FactControls + FactPanelController.cc +) + +add_custom_target(FactControlsQml + SOURCES + AltitudeFactTextField.qml + FactCheckBox.qml + FactLabel.qml + FactTextField.qml + FactTextFieldSlider.qml + FactBitmask.qml + FactComboBox.qml + FactTextFieldGrid.qml + FactTextFieldRow.qml + FactValueSlider.qml +) + +target_link_libraries(FactControls qgc) \ No newline at end of file -- 2.22.0