Commit bff39b26 authored by Daniel Agar's avatar Daniel Agar

cmake create VehicleSetup library in src/VehicleSetup

parent 64d85552
...@@ -16,7 +16,6 @@ include_directories( ...@@ -16,7 +16,6 @@ include_directories(
Terrain Terrain
uas uas
Vehicle Vehicle
VehicleSetup
VideoStreaming VideoStreaming
ViewWidgets ViewWidgets
) )
...@@ -183,13 +182,6 @@ add_library(qgc ...@@ -183,13 +182,6 @@ add_library(qgc
Vehicle/MultiVehicleManager.cc Vehicle/MultiVehicleManager.cc
Vehicle/Vehicle.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/VideoItem.cc
VideoStreaming/VideoReceiver.cc VideoStreaming/VideoReceiver.cc
VideoStreaming/VideoStreaming.cc VideoStreaming/VideoStreaming.cc
...@@ -247,6 +239,7 @@ add_subdirectory(MissionManager) ...@@ -247,6 +239,7 @@ add_subdirectory(MissionManager)
add_subdirectory(QmlControls) add_subdirectory(QmlControls)
add_subdirectory(QtLocationPlugin) add_subdirectory(QtLocationPlugin)
add_subdirectory(Settings) add_subdirectory(Settings)
add_subdirectory(VehicleSetup)
target_link_libraries(qgc target_link_libraries(qgc
...@@ -283,6 +276,7 @@ target_link_libraries(qgc ...@@ -283,6 +276,7 @@ target_link_libraries(qgc
QtLocationPlugin QtLocationPlugin
Settings Settings
ui ui
VehicleSetup
) )
target_include_directories(qgc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(qgc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
......
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})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment