Commit e25154e6 authored by Daniel Agar's avatar Daniel Agar

cmake: add Geo subdirectory

parent f272fa79
...@@ -94,7 +94,6 @@ add_library(qgc ...@@ -94,7 +94,6 @@ add_library(qgc
QGCComboBox.cc QGCComboBox.cc
QGCDockWidget.cc QGCDockWidget.cc
QGCFileDownload.cc QGCFileDownload.cc
QGCGeo.cc
QGCLoggingCategory.cc QGCLoggingCategory.cc
QGCMapPalette.cc QGCMapPalette.cc
QGCPalette.cc QGCPalette.cc
...@@ -105,8 +104,6 @@ add_library(qgc ...@@ -105,8 +104,6 @@ add_library(qgc
ShapeFileHelper.cc ShapeFileHelper.cc
SHPFileHelper.cc SHPFileHelper.cc
TerrainTile.cc TerrainTile.cc
UTM.cpp
) )
set_source_files_properties(QGCApplication.cc PROPERTIES COMPILE_DEFINITIONS GIT_VERSION="${git_tag}") set_source_files_properties(QGCApplication.cc PROPERTIES COMPILE_DEFINITIONS GIT_VERSION="${git_tag}")
...@@ -126,6 +123,7 @@ add_subdirectory(FirmwarePlugin) ...@@ -126,6 +123,7 @@ add_subdirectory(FirmwarePlugin)
add_subdirectory(FlightDisplay) add_subdirectory(FlightDisplay)
add_subdirectory(FlightMap) add_subdirectory(FlightMap)
add_subdirectory(FollowMe) add_subdirectory(FollowMe)
add_subdirectory(Geo)
add_subdirectory(GPS) add_subdirectory(GPS)
add_subdirectory(Joystick) add_subdirectory(Joystick)
add_subdirectory(MissionManager) add_subdirectory(MissionManager)
...@@ -162,6 +160,7 @@ target_link_libraries(qgc ...@@ -162,6 +160,7 @@ target_link_libraries(qgc
FlightDisplay FlightDisplay
FlightMap FlightMap
FollowMe FollowMe
Geo
gps gps
Joystick Joystick
MissionManager MissionManager
......
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}
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment