From 5445a7d8c9bd24176d0e7627de06a0d0773dad54 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 25 Oct 2018 15:04:20 -0400 Subject: [PATCH] cmake create Camera library in src/Camera --- src/CMakeLists.txt | 7 ++----- src/Camera/CMakeLists.txt | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 src/Camera/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 856a72644..f8ce53f46 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,7 +6,6 @@ include_directories( ${Qt5Location_PRIVATE_INCLUDE_DIRS} - Camera FlightDisplay FlightMap/Widgets FollowMe @@ -115,10 +114,6 @@ add_library(qgc ${EXTRA_SRC} - Camera/QGCCameraControl.cc - Camera/QGCCameraIO.cc - Camera/QGCCameraManager.cc - FlightDisplay/VideoManager.cc FlightMap/Widgets/ValuesWidgetController.cc @@ -176,6 +171,7 @@ add_subdirectory(Airmap) add_subdirectory(api) add_subdirectory(Audio) add_subdirectory(AutoPilotPlugins) +add_subdirectory(Camera) add_subdirectory(comm) add_subdirectory(FactSystem) add_subdirectory(FirmwarePlugin) @@ -213,6 +209,7 @@ target_link_libraries(qgc api Audio AutoPilotPlugins + Camera comm FactSystem FirmwarePlugin diff --git a/src/Camera/CMakeLists.txt b/src/Camera/CMakeLists.txt new file mode 100644 index 000000000..2aa59ef5f --- /dev/null +++ b/src/Camera/CMakeLists.txt @@ -0,0 +1,14 @@ + +add_library(Camera + QGCCameraControl.cc + QGCCameraIO.cc + QGCCameraManager.cc +) + +target_link_libraries(Camera + PUBLIC + qgc +) + +target_include_directories(Camera PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + -- 2.22.0