Browse Source

cmake create Settings library in src/Settings

QGC4.4
Daniel Agar 7 years ago
parent
commit
64d85552b5
  1. 16
      src/CMakeLists.txt
  2. 21
      src/Settings/CMakeLists.txt

16
src/CMakeLists.txt

@ -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
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)
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
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})

21
src/Settings/CMakeLists.txt

@ -0,0 +1,21 @@
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})
Loading…
Cancel
Save