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
08684db3
Commit
08684db3
authored
Oct 25, 2018
by
Daniel Agar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake create ui library in src/ui
parent
1c00bea6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
71 additions
and
42 deletions
+71
-42
CMakeLists.txt
src/CMakeLists.txt
+5
-42
CMakeLists.txt
src/MissionManager/CMakeLists.txt
+2
-0
CMakeLists.txt
src/ui/CMakeLists.txt
+64
-0
No files found.
src/CMakeLists.txt
View file @
08684db3
...
@@ -24,8 +24,6 @@ include_directories(
...
@@ -24,8 +24,6 @@ include_directories(
Settings
Settings
Terrain
Terrain
uas
uas
ui
ui/linechart
Vehicle
Vehicle
VehicleSetup
VehicleSetup
VideoStreaming
VideoStreaming
...
@@ -165,22 +163,7 @@ endif()
...
@@ -165,22 +163,7 @@ endif()
set
(
QGC_UI
)
set
(
QGC_UI
)
list
(
APPEND QGC_UI
list
(
APPEND QGC_UI
#src/ui/Linechart.ui
QGCQmlWidgetHolder.ui
QGCQmlWidgetHolder.ui
ui/MainWindow.ui
ui/MultiVehicleDockWidget.ui
ui/QGCHilConfiguration.ui
ui/QGCHilFlightGearConfiguration.ui
ui/QGCHilJSBSimConfiguration.ui
ui/QGCHilXPlaneConfiguration.ui
ui/QGCMapRCToParamDialog.ui
ui/QGCMAVLinkInspector.ui
ui/QGCMAVLinkLogPlayer.ui
ui/QGCPluginHost.ui
ui/QGCUASFileView.ui
ui/QGCUASFileViewMulti.ui
ui/QMap3D.ui
ui/uas/QGCUnconnectedInfoWidget.ui
)
)
add_library
(
qgc
add_library
(
qgc
...
@@ -290,29 +273,6 @@ add_library(qgc
...
@@ -290,29 +273,6 @@ add_library(qgc
uas/UAS.cc
uas/UAS.cc
uas/UASMessageHandler.cc
uas/UASMessageHandler.cc
ui/HILDockWidget.cc
ui/linechart/ChartPlot.cc
ui/linechart/IncrementalPlot.cc
ui/linechart/LinechartPlot.cc
ui/linechart/Linecharts.cc
ui/linechart/LinechartWidget.cc
ui/linechart/Scrollbar.cc
ui/linechart/ScrollZoomer.cc
ui/MainWindow.cc
ui/MAVLinkDecoder.cc
ui/MultiVehicleDockWidget.cc
ui/QGCHilConfiguration.cc
ui/QGCHilFlightGearConfiguration.cc
ui/QGCHilJSBSimConfiguration.cc
ui/QGCHilXPlaneConfiguration.cc
ui/QGCMapRCToParamDialog.cpp
ui/QGCMAVLinkInspector.cc
ui/QGCMAVLinkLogPlayer.cc
ui/QGCPluginHost.cc
ui/QGCUASFileView.cc
ui/QGCUASFileViewMulti.cc
ui/uas/QGCUnconnectedInfoWidget.cc
Vehicle/ADSBVehicle.cc
Vehicle/ADSBVehicle.cc
Vehicle/GPSRTKFactGroup.cc
Vehicle/GPSRTKFactGroup.cc
Vehicle/MAVLinkLogManager.cc
Vehicle/MAVLinkLogManager.cc
...
@@ -367,12 +327,13 @@ add_library(qgc
...
@@ -367,12 +327,13 @@ add_library(qgc
QtLocationPlugin/QGCMapEngineData.h
QtLocationPlugin/QGCMapEngineData.h
uas/UAS.h
uas/UAS.h
uas/UASInterface.h
uas/UASInterface.h
ui/QGCHilFlightGearConfiguration.h
ui/QGCHilJSBSimConfiguration.h
)
)
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
}
"
)
add_subdirectory
(
ui
)
add_subdirectory
(
AnalyzeView
)
add_subdirectory
(
AnalyzeView
)
add_subdirectory
(
Airmap
)
add_subdirectory
(
Airmap
)
add_subdirectory
(
api
)
add_subdirectory
(
api
)
...
@@ -381,6 +342,7 @@ add_subdirectory(AutoPilotPlugins)
...
@@ -381,6 +342,7 @@ add_subdirectory(AutoPilotPlugins)
add_subdirectory
(
GPS
)
add_subdirectory
(
GPS
)
add_subdirectory
(
MissionManager
)
add_subdirectory
(
MissionManager
)
target_link_libraries
(
qgc
target_link_libraries
(
qgc
PUBLIC
PUBLIC
...
@@ -408,6 +370,7 @@ target_link_libraries(qgc
...
@@ -408,6 +370,7 @@ target_link_libraries(qgc
gps
gps
qwt
# LinechartWidget
qwt
# LinechartWidget
MissionManager
MissionManager
ui
)
)
target_include_directories
(
qgc INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
target_include_directories
(
qgc INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
...
...
src/MissionManager/CMakeLists.txt
View file @
08684db3
...
@@ -67,6 +67,8 @@ add_library(MissionManager
...
@@ -67,6 +67,8 @@ add_library(MissionManager
target_link_libraries
(
MissionManager
target_link_libraries
(
MissionManager
PUBLIC
PUBLIC
qgc
qgc
PRIVATE
ui
)
)
target_include_directories
(
MissionManager
target_include_directories
(
MissionManager
...
...
src/ui/CMakeLists.txt
0 → 100644
View file @
08684db3
add_library
(
ui
HILDockWidget.cc
linechart/ChartPlot.cc
linechart/IncrementalPlot.cc
linechart/LinechartPlot.cc
linechart/Linecharts.cc
linechart/LinechartWidget.cc
linechart/Scrollbar.cc
linechart/ScrollZoomer.cc
MainWindow.cc
MAVLinkDecoder.cc
MultiVehicleDockWidget.cc
QGCHilConfiguration.cc
QGCHilFlightGearConfiguration.cc
QGCHilJSBSimConfiguration.cc
QGCHilXPlaneConfiguration.cc
QGCMapRCToParamDialog.cpp
QGCMAVLinkInspector.cc
QGCMAVLinkLogPlayer.cc
QGCPluginHost.cc
QGCUASFileView.cc
QGCUASFileViewMulti.cc
uas/QGCUnconnectedInfoWidget.cc
# HEADERS
# shouldn't be listed here, but aren't named properly for AUTOMOC
QGCHilFlightGearConfiguration.h
QGCHilJSBSimConfiguration.h
# UI
MainWindow.ui
MultiVehicleDockWidget.ui
QGCHilConfiguration.ui
QGCHilFlightGearConfiguration.ui
QGCHilJSBSimConfiguration.ui
QGCHilXPlaneConfiguration.ui
QGCMapRCToParamDialog.ui
QGCMAVLinkInspector.ui
QGCMAVLinkLogPlayer.ui
QGCPluginHost.ui
QGCUASFileView.ui
QGCUASFileViewMulti.ui
QMap3D.ui
uas/QGCUnconnectedInfoWidget.ui
)
target_link_libraries
(
ui
PUBLIC
qgc
)
target_include_directories
(
ui
INTERFACE
${
CMAKE_CURRENT_SOURCE_DIR
}
${
CMAKE_CURRENT_BINARY_DIR
}
PRIVATE
linechart
)
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