Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
64d85552
Commit
64d85552
authored
Oct 25, 2018
by
Daniel Agar
Browse files
cmake create Settings library in src/Settings
parent
3eacac30
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/CMakeLists.txt
View file @
64d85552
...
...
@@ -13,7 +13,6 @@ include_directories(
Joystick
PositionManager
qgcunittest
Settings
Terrain
uas
Vehicle
...
...
@@ -172,17 +171,6 @@ add_library(qgc
PositionManager/PositionManager.cpp
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
uas/FileManager.cc
...
...
@@ -258,6 +246,7 @@ add_subdirectory(GPS)
add_subdirectory
(
MissionManager
)
add_subdirectory
(
QmlControls
)
add_subdirectory
(
QtLocationPlugin
)
add_subdirectory
(
Settings
)
target_link_libraries
(
qgc
...
...
@@ -292,10 +281,9 @@ target_link_libraries(qgc
MissionManager
QmlControls
QtLocationPlugin
Settings
ui
)
target_include_directories
(
qgc INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
src/Settings/CMakeLists.txt
0 → 100644
View file @
64d85552
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
}
)
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment