Commit 64d85552 authored by Daniel Agar's avatar Daniel Agar

cmake create Settings library in src/Settings

parent 3eacac30
...@@ -13,7 +13,6 @@ include_directories( ...@@ -13,7 +13,6 @@ include_directories(
Joystick Joystick
PositionManager PositionManager
qgcunittest qgcunittest
Settings
Terrain Terrain
uas uas
Vehicle Vehicle
...@@ -172,17 +171,6 @@ add_library(qgc ...@@ -172,17 +171,6 @@ add_library(qgc
PositionManager/PositionManager.cpp PositionManager/PositionManager.cpp
PositionManager/SimulatedPosition.cc PositionManager/SimulatedPosition.cc
Settings/AppSettings.cc
Settings/AutoConnectSettings.cc
Settings/BrandImageSettings.cc
Settings/FlightMapSettings.cc
Settings/GuidedSettings.cc
Settings/RTKSettings.cc
Settings/SettingsGroup.cc
Settings/SettingsManager.cc
Settings/UnitsSettings.cc
Settings/VideoSettings.cc
Terrain/TerrainQuery.cc Terrain/TerrainQuery.cc
uas/FileManager.cc uas/FileManager.cc
...@@ -258,6 +246,7 @@ add_subdirectory(GPS) ...@@ -258,6 +246,7 @@ add_subdirectory(GPS)
add_subdirectory(MissionManager) add_subdirectory(MissionManager)
add_subdirectory(QmlControls) add_subdirectory(QmlControls)
add_subdirectory(QtLocationPlugin) add_subdirectory(QtLocationPlugin)
add_subdirectory(Settings)
target_link_libraries(qgc target_link_libraries(qgc
...@@ -292,10 +281,9 @@ target_link_libraries(qgc ...@@ -292,10 +281,9 @@ target_link_libraries(qgc
MissionManager MissionManager
QmlControls QmlControls
QtLocationPlugin QtLocationPlugin
Settings
ui ui
) )
target_include_directories(qgc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(qgc INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
add_library(Settings
AppSettings.cc
AutoConnectSettings.cc
BrandImageSettings.cc
FlightMapSettings.cc
GuidedSettings.cc
RTKSettings.cc
SettingsGroup.cc
SettingsManager.cc
UnitsSettings.cc
VideoSettings.cc
)
target_link_libraries(Settings
PUBLIC
qgc
)
target_include_directories(Settings 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