From a669dfb7b593ff47bc1a04f399f94f0b427789dd Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 25 Oct 2018 15:35:54 -0400 Subject: [PATCH] cmake create Terrain library in src/Terrain --- src/CMakeLists.txt | 5 ++--- src/Terrain/CMakeLists.txt | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 src/Terrain/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3e1b94658..c90b0a0a9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,7 +7,6 @@ include_directories( ${Qt5Location_PRIVATE_INCLUDE_DIRS} qgcunittest - Terrain ) set(EXTRA_SRC) @@ -108,8 +107,6 @@ add_library(qgc ${EXTRA_SRC} - Terrain/TerrainQuery.cc - CmdLineOptParser.cc JsonHelper.cc KMLFileHelper.cc @@ -162,6 +159,7 @@ add_subdirectory(PositionManager) add_subdirectory(QmlControls) add_subdirectory(QtLocationPlugin) add_subdirectory(Settings) +add_subdirectory(Terrain) add_subdirectory(uas) add_subdirectory(Vehicle) add_subdirectory(VehicleSetup) @@ -207,6 +205,7 @@ target_link_libraries(qgc QtLocationPlugin qwt # LinechartWidget Settings + Terrain uas ui Vehicle diff --git a/src/Terrain/CMakeLists.txt b/src/Terrain/CMakeLists.txt new file mode 100644 index 000000000..9ffc9ef0e --- /dev/null +++ b/src/Terrain/CMakeLists.txt @@ -0,0 +1,15 @@ + +add_library(Terrain + TerrainQuery.cc +) + +target_link_libraries(Terrain + PUBLIC + qgc +) + +target_include_directories(Terrain + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ) + -- 2.22.0