From 18262ebed5e6d52e66931aa5808d09e335237203 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 25 Oct 2018 15:19:20 -0400 Subject: [PATCH] cmake create ViewWidgets library in src/ViewWidgets --- src/CMakeLists.txt | 7 ++----- src/ViewWidgets/CMakeLists.txt | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 src/ViewWidgets/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5c157eab0..60e4daf5e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,7 +11,6 @@ include_directories( PositionManager qgcunittest Terrain - ViewWidgets ) set(EXTRA_SRC) @@ -121,10 +120,6 @@ add_library(qgc Terrain/TerrainQuery.cc - ViewWidgets/CustomCommandWidget.cc - ViewWidgets/CustomCommandWidgetController.cc - ViewWidgets/ViewWidgetController.cc - CmdLineOptParser.cc JsonHelper.cc KMLFileHelper.cc @@ -178,6 +173,7 @@ add_subdirectory(uas) add_subdirectory(Vehicle) add_subdirectory(VehicleSetup) add_subdirectory(VideoStreaming) +add_subdirectory(ViewWidgets) target_link_libraries(qgc @@ -220,6 +216,7 @@ target_link_libraries(qgc Vehicle VehicleSetup VideoStreaming + ViewWidgets ) target_include_directories(qgc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/src/ViewWidgets/CMakeLists.txt b/src/ViewWidgets/CMakeLists.txt new file mode 100644 index 000000000..ff2dca485 --- /dev/null +++ b/src/ViewWidgets/CMakeLists.txt @@ -0,0 +1,14 @@ + +add_library(ViewWidgets + CustomCommandWidget.cc + CustomCommandWidgetController.cc + ViewWidgetController.cc +) + +target_link_libraries(ViewWidgets + PUBLIC + qgc +) + +target_include_directories(ViewWidgets PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + -- 2.22.0