From 77b545c78b29b201b007a8d743bd1c1c15b017d3 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 25 Oct 2018 15:08:58 -0400 Subject: [PATCH] cmake create FlightDisplay library in src/FlightDisplay --- src/CMakeLists.txt | 5 ++--- src/FlightDisplay/CMakeLists.txt | 11 +++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 src/FlightDisplay/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f8ce53f46..e82687600 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,7 +6,6 @@ include_directories( ${Qt5Location_PRIVATE_INCLUDE_DIRS} - FlightDisplay FlightMap/Widgets FollowMe Joystick @@ -114,8 +113,6 @@ add_library(qgc ${EXTRA_SRC} - FlightDisplay/VideoManager.cc - FlightMap/Widgets/ValuesWidgetController.cc FollowMe/FollowMe.cc @@ -175,6 +172,7 @@ add_subdirectory(Camera) add_subdirectory(comm) add_subdirectory(FactSystem) add_subdirectory(FirmwarePlugin) +add_subdirectory(FlightDisplay) add_subdirectory(GPS) add_subdirectory(MissionManager) add_subdirectory(QmlControls) @@ -213,6 +211,7 @@ target_link_libraries(qgc comm FactSystem FirmwarePlugin + FlightDisplay gps qwt # LinechartWidget MissionManager diff --git a/src/FlightDisplay/CMakeLists.txt b/src/FlightDisplay/CMakeLists.txt new file mode 100644 index 000000000..f433488a8 --- /dev/null +++ b/src/FlightDisplay/CMakeLists.txt @@ -0,0 +1,11 @@ + +add_library(FlightDisplay + VideoManager.cc +) + +target_link_libraries(FlightDisplay + PUBLIC + qgc +) + +target_include_directories(FlightDisplay PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -- 2.22.0