Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
7e11e615
Commit
7e11e615
authored
Nov 10, 2018
by
Daniel Agar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake cleanup dependency handling
parent
760006ea
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
82 additions
and
96 deletions
+82
-96
CMakeLists.txt
CMakeLists.txt
+1
-1
CMakeLists.txt
src/AnalyzeView/CMakeLists.txt
+4
-3
CMakeLists.txt
src/Audio/CMakeLists.txt
+6
-6
CMakeLists.txt
src/AutoPilotPlugins/CMakeLists.txt
+5
-4
CMakeLists.txt
src/CMakeLists.txt
+32
-47
CMakeLists.txt
src/FactSystem/CMakeLists.txt
+4
-3
CMakeLists.txt
src/FlightDisplay/CMakeLists.txt
+1
-1
CMakeLists.txt
src/FlightMap/CMakeLists.txt
+1
-1
CMakeLists.txt
src/MissionManager/CMakeLists.txt
+4
-6
CMakeLists.txt
src/QmlControls/CMakeLists.txt
+6
-5
CMakeLists.txt
src/QtLocationPlugin/CMakeLists.txt
+2
-3
CMakeLists.txt
src/Terrain/CMakeLists.txt
+1
-1
CMakeLists.txt
src/Vehicle/CMakeLists.txt
+1
-2
CMakeLists.txt
src/VehicleSetup/CMakeLists.txt
+1
-2
CMakeLists.txt
src/VideoStreaming/CMakeLists.txt
+3
-2
CMakeLists.txt
src/ViewWidgets/CMakeLists.txt
+1
-2
CMakeLists.txt
src/comm/CMakeLists.txt
+4
-3
CMakeLists.txt
src/qgcunittest/CMakeLists.txt
+1
-1
CMakeLists.txt
src/uas/CMakeLists.txt
+2
-2
CMakeLists.txt
src/ui/CMakeLists.txt
+2
-1
No files found.
CMakeLists.txt
View file @
7e11e615
...
...
@@ -204,7 +204,7 @@ else()
add_executable
(
QGroundControl
${
QGC_RESOURCES
}
)
endif
()
target_link_libraries
(
QGroundControl P
UBLIC
qgc
)
target_link_libraries
(
QGroundControl P
RIVATE
qgc
)
if
(
NOT QT_MKSPEC MATCHES
"winrt"
)
target_link_libraries
(
QGroundControl
...
...
src/AnalyzeView/CMakeLists.txt
View file @
7e11e615
...
...
@@ -17,14 +17,15 @@ add_library(AnalyzeView
)
target_link_libraries
(
AnalyzeView
PRIVATE
qgc
PUBLIC
Qt5::Location
Qt5::SerialPort
Qt5::TextToSpeech
Qt5::Widgets
qgc
)
target_include_directories
(
AnalyzeView
PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
)
target_include_directories
(
AnalyzeView
INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
src/Audio/CMakeLists.txt
View file @
7e11e615
...
...
@@ -12,13 +12,13 @@ add_library(Audio
)
target_link_libraries
(
Audio
PRIVATE
qgc
PUBLIC
Qt5::Core
Qt5::Qml
Qt5::TextToSpeech
Qt5::Widgets
qgc
Qt5::Core
Qt5::Qml
Qt5::TextToSpeech
Qt5::Widgets
)
target_include_directories
(
Audio PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
)
...
...
src/AutoPilotPlugins/CMakeLists.txt
View file @
7e11e615
...
...
@@ -27,6 +27,8 @@ add_library(AutoPilotPlugins
Common/SyslinkComponent.cc
Common/SyslinkComponentController.cc
Generic/GenericAutoPilotPlugin.cc
PX4/AirframeComponent.cc
PX4/AirframeComponentAirframes.cc
PX4/AirframeComponentController.cc
...
...
@@ -45,19 +47,18 @@ add_library(AutoPilotPlugins
PX4/SensorsComponentController.cc
AutoPilotPlugin.cc
Generic/GenericAutoPilotPlugin.cc
)
target_link_libraries
(
AutoPilotPlugins
P
UBLIC
P
RIVATE
qgc
)
target_include_directories
(
AutoPilotPlugins
PUBLIC
INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
PUBLIC
APM
Common
PX4
)
src/CMakeLists.txt
View file @
7e11e615
...
...
@@ -73,6 +73,7 @@ add_library(qgc
JsonHelper.cc
KMLFileHelper.cc
LogCompressor.cc
main.cc
QGC.cc
QGCApplication.cc
QGCComboBox.cc
...
...
@@ -91,7 +92,6 @@ add_library(qgc
RunGuard.cc
TerrainTile.cc
UTM.cpp
main.cc
# UI
QGCQmlWidgetHolder.ui
...
...
@@ -100,8 +100,6 @@ add_library(qgc
set_source_files_properties
(
QGCApplication.cc PROPERTIES COMPILE_DEFINITIONS GIT_VERSION=
"
${
git_tag
}
"
)
add_subdirectory
(
ui
)
add_subdirectory
(
Airmap
)
add_subdirectory
(
AnalyzeView
)
add_subdirectory
(
api
)
...
...
@@ -123,57 +121,45 @@ add_subdirectory(QtLocationPlugin)
add_subdirectory
(
Settings
)
add_subdirectory
(
Terrain
)
add_subdirectory
(
uas
)
add_subdirectory
(
ui
)
add_subdirectory
(
Vehicle
)
add_subdirectory
(
VehicleSetup
)
add_subdirectory
(
VideoStreaming
)
add_subdirectory
(
ViewWidgets
)
target_link_libraries
(
qgc
PRIVATE
PUBLIC
Qt5::Bluetooth
Qt5::Concurrent
Qt5::Core
Qt5::Location
Qt5::Multimedia
Qt5::Positioning
Qt5::Quick
Qt5::QuickWidgets
Qt5::Sql
Qt5::Svg
Qt5::Test
Qt5::TextToSpeech
Qt5::Widgets
Qt5::Xml
Airmap
AnalyzeView
api
Audio
AutoPilotPlugins
Camera
comm
FactSystem
FirmwarePlugin
FlightDisplay
FlightMap
FollowMe
gps
Joystick
MissionManager
PositionManager
QmlControls
QtLocationPlugin
qwt
# LinechartWidget
Settings
Terrain
uas
ui
Vehicle
VehicleSetup
VideoStreaming
ViewWidgets
Qt5::QuickWidgets
Qt5::Widgets
Airmap
AnalyzeView
api
Audio
AutoPilotPlugins
Camera
comm
FactSystem
FirmwarePlugin
FlightDisplay
FlightMap
FollowMe
gps
Joystick
MissionManager
PositionManager
QmlControls
QtLocationPlugin
Settings
Terrain
uas
ui
Vehicle
VehicleSetup
VideoStreaming
ViewWidgets
)
if
(
BUILD_TESTING
)
...
...
@@ -181,4 +167,3 @@ if(BUILD_TESTING)
endif
()
target_include_directories
(
qgc INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
src/FactSystem/CMakeLists.txt
View file @
7e11e615
...
...
@@ -18,17 +18,18 @@ add_library(FactSystem
FactValueSliderListModel.cc
ParameterManager.cc
SettingsFact.cc
${
EXTRA_SRC
}
)
target_link_libraries
(
FactSystem
P
UBLIC
P
RIVATE
qgc
)
target_include_directories
(
FactSystem
PUBLIC
INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
PUBLIC
FactControls
)
src/FlightDisplay/CMakeLists.txt
View file @
7e11e615
...
...
@@ -4,7 +4,7 @@ add_library(FlightDisplay
)
target_link_libraries
(
FlightDisplay
P
UBLIC
P
RIVATE
qgc
)
...
...
src/FlightMap/CMakeLists.txt
View file @
7e11e615
...
...
@@ -4,7 +4,7 @@ add_library(FlightMap
)
target_link_libraries
(
FlightMap
P
UBLIC
P
RIVATE
qgc
)
...
...
src/MissionManager/CMakeLists.txt
View file @
7e11e615
...
...
@@ -66,13 +66,11 @@ add_library(MissionManager
target_link_libraries
(
MissionManager
PUBLIC
qgc
Qt5::Xml
PRIVATE
qgc
ui
)
target_include_directories
(
MissionManager
PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
)
target_include_directories
(
MissionManager INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
src/QmlControls/CMakeLists.txt
View file @
7e11e615
...
...
@@ -15,16 +15,17 @@ add_library(QmlControls
)
target_link_libraries
(
QmlControls
PRIVATE
qgc
FactSystem
PUBLIC
Qt5::Concurrent
Qt5::Location
Qt5::SerialPort
Qt5::TextToSpeech
Qt5::Widgets
qgc
FactSystem
)
target_include_directories
(
QmlControls
PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
)
target_include_directories
(
QmlControls
INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
src/QtLocationPlugin/CMakeLists.txt
View file @
7e11e615
...
...
@@ -21,14 +21,13 @@ add_library(QtLocationPlugin
target_link_libraries
(
QtLocationPlugin
PUBLIC
Qt5::Location
Qt5::Sql
qgc
)
target_include_directories
(
QtLocationPlugin
PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
QMLControl
)
src/Terrain/CMakeLists.txt
View file @
7e11e615
...
...
@@ -4,7 +4,7 @@ add_library(Terrain
)
target_link_libraries
(
Terrain
P
UBLIC
P
RIVATE
qgc
)
...
...
src/Vehicle/CMakeLists.txt
View file @
7e11e615
...
...
@@ -20,5 +20,4 @@ target_link_libraries(Vehicle
qgc
)
target_include_directories
(
Vehicle PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
)
target_include_directories
(
Vehicle INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
src/VehicleSetup/CMakeLists.txt
View file @
7e11e615
...
...
@@ -13,5 +13,4 @@ target_link_libraries(VehicleSetup
qgc
)
target_include_directories
(
VehicleSetup PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
)
target_include_directories
(
VehicleSetup INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
src/VideoStreaming/CMakeLists.txt
View file @
7e11e615
...
...
@@ -33,7 +33,8 @@ add_library(VideoStreaming
target_link_libraries
(
VideoStreaming
PUBLIC
qgc
)
target_include_directories
(
VideoStreaming PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
)
Qt5::Multimedia
)
target_include_directories
(
VideoStreaming INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
src/ViewWidgets/CMakeLists.txt
View file @
7e11e615
...
...
@@ -10,5 +10,4 @@ target_link_libraries(ViewWidgets
qgc
)
target_include_directories
(
ViewWidgets PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
)
target_include_directories
(
ViewWidgets INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
src/comm/CMakeLists.txt
View file @
7e11e615
...
...
@@ -35,14 +35,15 @@ add_library(comm
)
target_link_libraries
(
comm
PRIVATE
qgc
PUBLIC
Qt5::Location
Qt5::SerialPort
Qt5::Test
Qt5::TextToSpeech
Qt5::Widgets
qgc
)
target_include_directories
(
comm
PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
)
target_include_directories
(
comm
INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
src/qgcunittest/CMakeLists.txt
View file @
7e11e615
...
...
@@ -17,7 +17,7 @@ add_library(qgcunittest
)
target_link_libraries
(
qgcunittest
P
UBLIC
P
RIVATE
qgc
)
...
...
src/uas/CMakeLists.txt
View file @
7e11e615
...
...
@@ -11,9 +11,9 @@ add_library(uas
)
target_link_libraries
(
uas
P
UBLIC
P
RIVATE
qgc
)
target_include_directories
(
uas
PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
)
target_include_directories
(
uas
INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
src/ui/CMakeLists.txt
View file @
7e11e615
...
...
@@ -50,8 +50,9 @@ add_library(ui
)
target_link_libraries
(
ui
P
UBLIC
P
RIVATE
qgc
qwt
)
target_include_directories
(
ui
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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