From bff39b26c5f9e66e866e5b32f2d61faab611aba8 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 25 Oct 2018 14:46:46 -0400 Subject: [PATCH] cmake create VehicleSetup library in src/VehicleSetup --- src/CMakeLists.txt | 10 ++-------- src/VehicleSetup/CMakeLists.txt | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 src/VehicleSetup/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e38f1a469..6cfe725ed 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,7 +16,6 @@ include_directories( Terrain uas Vehicle - VehicleSetup VideoStreaming ViewWidgets ) @@ -183,13 +182,6 @@ add_library(qgc Vehicle/MultiVehicleManager.cc Vehicle/Vehicle.cc - VehicleSetup/Bootloader.cc - VehicleSetup/FirmwareImage.cc - VehicleSetup/FirmwareUpgradeController.cc - VehicleSetup/JoystickConfigController.cc - VehicleSetup/PX4FirmwareUpgradeThread.cc - VehicleSetup/VehicleComponent.cc - VideoStreaming/VideoItem.cc VideoStreaming/VideoReceiver.cc VideoStreaming/VideoStreaming.cc @@ -247,6 +239,7 @@ add_subdirectory(MissionManager) add_subdirectory(QmlControls) add_subdirectory(QtLocationPlugin) add_subdirectory(Settings) +add_subdirectory(VehicleSetup) target_link_libraries(qgc @@ -283,6 +276,7 @@ target_link_libraries(qgc QtLocationPlugin Settings ui + VehicleSetup ) target_include_directories(qgc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/VehicleSetup/CMakeLists.txt b/src/VehicleSetup/CMakeLists.txt new file mode 100644 index 000000000..249b95f28 --- /dev/null +++ b/src/VehicleSetup/CMakeLists.txt @@ -0,0 +1,17 @@ + +add_library(VehicleSetup + Bootloader.cc + FirmwareImage.cc + FirmwareUpgradeController.cc + JoystickConfigController.cc + PX4FirmwareUpgradeThread.cc + VehicleComponent.cc +) + +target_link_libraries(VehicleSetup + PUBLIC + qgc +) + +target_include_directories(VehicleSetup PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + -- 2.22.0