From e25154e6e9771c2556ce03105aad55d2f5efce6f Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Fri, 22 Nov 2019 15:28:04 -0500
Subject: [PATCH] cmake: add Geo subdirectory
---
src/CMakeLists.txt | 5 ++---
src/Geo/CMakeLists.txt | 30 ++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 3 deletions(-)
create mode 100644 src/Geo/CMakeLists.txt
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4436e95..6e3d1a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -94,7 +94,6 @@ add_library(qgc
QGCComboBox.cc
QGCDockWidget.cc
QGCFileDownload.cc
- QGCGeo.cc
QGCLoggingCategory.cc
QGCMapPalette.cc
QGCPalette.cc
@@ -105,8 +104,6 @@ add_library(qgc
ShapeFileHelper.cc
SHPFileHelper.cc
TerrainTile.cc
-
- UTM.cpp
)
set_source_files_properties(QGCApplication.cc PROPERTIES COMPILE_DEFINITIONS GIT_VERSION="${git_tag}")
@@ -126,6 +123,7 @@ add_subdirectory(FirmwarePlugin)
add_subdirectory(FlightDisplay)
add_subdirectory(FlightMap)
add_subdirectory(FollowMe)
+add_subdirectory(Geo)
add_subdirectory(GPS)
add_subdirectory(Joystick)
add_subdirectory(MissionManager)
@@ -162,6 +160,7 @@ target_link_libraries(qgc
FlightDisplay
FlightMap
FollowMe
+ Geo
gps
Joystick
MissionManager
diff --git a/src/Geo/CMakeLists.txt b/src/Geo/CMakeLists.txt
new file mode 100644
index 0000000..b94ed35
--- /dev/null
+++ b/src/Geo/CMakeLists.txt
@@ -0,0 +1,30 @@
+
+add_library(Geo
+ Constants.hpp
+ Math.cpp
+ Math.hpp
+ MGRS.cpp
+ MGRS.hpp
+ PolarStereographic.cpp
+ PolarStereographic.hpp
+ QGCGeo.cc
+ QGCGeo.h
+ TransverseMercator.cpp
+ TransverseMercator.hpp
+ Utility.cpp
+ Utility.h
+ Utility.hpp
+ UTMUPS.cpp
+ UTMUPS.hpp
+)
+
+target_link_libraries(Geo
+ PUBLIC
+ qgc
+)
+
+target_include_directories(Geo
+ PUBLIC
+ ${CMAKE_CURRENT_SOURCE_DIR}
+)
+