Browse Source

cmake: remove MultiVehicleDockWidget and fix Analyze (Qt5::Charts)

QGC4.4
Daniel Agar 5 years ago
parent
commit
18df0b7dc9
  1. 1
      CMakeLists.txt
  2. 4
      src/AnalyzeView/CMakeLists.txt
  3. 9
      src/ui/CMakeLists.txt

1
CMakeLists.txt

@ -90,6 +90,7 @@ include(Qt5QGCConfiguration) @@ -90,6 +90,7 @@ include(Qt5QGCConfiguration)
find_package(Qt5 ${QT_VERSION}
COMPONENTS
Bluetooth
Charts
Concurrent
Core
Location

4
src/AnalyzeView/CMakeLists.txt

@ -17,8 +17,7 @@ add_library(AnalyzeView @@ -17,8 +17,7 @@ add_library(AnalyzeView
${EXTRA_SRC}
)
add_custom_target(
AnalyzeViewQml
add_custom_target(AnalyzeViewQml
SOURCES
AnalyzePage.qml
AnalyzeView.qml
@ -33,6 +32,7 @@ target_link_libraries(AnalyzeView @@ -33,6 +32,7 @@ target_link_libraries(AnalyzeView
qgc
PUBLIC
Qt5::Charts
Qt5::Location
Qt5::SerialPort
Qt5::TextToSpeech

9
src/ui/CMakeLists.txt

@ -4,18 +4,12 @@ add_subdirectory(toolbar) @@ -4,18 +4,12 @@ add_subdirectory(toolbar)
add_library(ui
MAVLinkDecoder.cc
MultiVehicleDockWidget.cc
QGCPluginHost.cc
# HEADERS
# shouldn't be listed here, but aren't named properly for AUTOMOC
MAVLinkDecoder.h
MultiVehicleDockWidget.h
QGCMapRCToParamDialog.h
QGCPluginHost.cc
QGCPluginHost.h
# UI
MultiVehicleDockWidget.ui
QGCMapRCToParamDialog.ui
QGCPluginHost.ui
QMap3D.ui
@ -40,4 +34,3 @@ target_include_directories(ui @@ -40,4 +34,3 @@ target_include_directories(ui
PRIVATE
linechart
)

Loading…
Cancel
Save