Commit 18df0b7d authored by Daniel Agar's avatar Daniel Agar

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

parent 86da51f3
......@@ -90,6 +90,7 @@ include(Qt5QGCConfiguration)
find_package(Qt5 ${QT_VERSION}
COMPONENTS
Bluetooth
Charts
Concurrent
Core
Location
......
......@@ -17,15 +17,14 @@ add_library(AnalyzeView
${EXTRA_SRC}
)
add_custom_target(
AnalyzeViewQml
SOURCES
AnalyzePage.qml
AnalyzeView.qml
GeoTagPage.qml
LogDownloadPage.qml
MavlinkConsolePage.qml
MAVLinkInspectorPage.qml
add_custom_target(AnalyzeViewQml
SOURCES
AnalyzePage.qml
AnalyzeView.qml
GeoTagPage.qml
LogDownloadPage.qml
MavlinkConsolePage.qml
MAVLinkInspectorPage.qml
)
target_link_libraries(AnalyzeView
......@@ -33,6 +32,7 @@ target_link_libraries(AnalyzeView
qgc
PUBLIC
Qt5::Charts
Qt5::Location
Qt5::SerialPort
Qt5::TextToSpeech
......
......@@ -4,28 +4,22 @@ 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
)
add_custom_target(uiQml
SOURCES
AppSettings.qml
ExitWithErrorWindow.qml
MainRootWindow.qml
SOURCES
AppSettings.qml
ExitWithErrorWindow.qml
MainRootWindow.qml
)
target_link_libraries(ui
......@@ -39,5 +33,4 @@ target_include_directories(ui
${CMAKE_CURRENT_BINARY_DIR}
PRIVATE
linechart
)
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment