Commit 5df65cdb authored by Daniel Agar's avatar Daniel Agar

cmake create QmlControls library in src/QmlControls

parent a8baec09
...@@ -16,7 +16,6 @@ include_directories( ...@@ -16,7 +16,6 @@ include_directories(
Joystick Joystick
PositionManager PositionManager
qgcunittest qgcunittest
QmlControls
QtLocationPlugin QtLocationPlugin
Settings Settings
Terrain Terrain
...@@ -191,19 +190,6 @@ add_library(qgc ...@@ -191,19 +190,6 @@ add_library(qgc
PositionManager/PositionManager.cpp PositionManager/PositionManager.cpp
PositionManager/SimulatedPosition.cc PositionManager/SimulatedPosition.cc
QmlControls/AppMessages.cc
QmlControls/CoordinateVector.cc
QmlControls/EditPositionDialogController.cc
QmlControls/ParameterEditorController.cc
QmlControls/QGCFileDialogController.cc
QmlControls/QGCGeoBoundingCube.cc
QmlControls/QGCImageProvider.cc
QmlControls/QGroundControlQmlGlobal.cc
QmlControls/QmlObjectListModel.cc
QmlControls/QmlTestWidget.cc
QmlControls/RCChannelMonitorController.cc
QmlControls/ScreenToolsController.cc
QtLocationPlugin/QGCMapEngine.cpp QtLocationPlugin/QGCMapEngine.cpp
QtLocationPlugin/QGCMapTileSet.cpp QtLocationPlugin/QGCMapTileSet.cpp
QtLocationPlugin/QGCMapUrlEngine.cpp QtLocationPlugin/QGCMapUrlEngine.cpp
...@@ -300,6 +286,7 @@ add_subdirectory(comm) ...@@ -300,6 +286,7 @@ add_subdirectory(comm)
add_subdirectory(FirmwarePlugin) add_subdirectory(FirmwarePlugin)
add_subdirectory(GPS) add_subdirectory(GPS)
add_subdirectory(MissionManager) add_subdirectory(MissionManager)
add_subdirectory(QmlControls)
target_link_libraries(qgc target_link_libraries(qgc
...@@ -331,6 +318,7 @@ target_link_libraries(qgc ...@@ -331,6 +318,7 @@ target_link_libraries(qgc
gps gps
qwt # LinechartWidget qwt # LinechartWidget
MissionManager MissionManager
QmlControls
ui ui
) )
......
add_library(QmlControls
AppMessages.cc
CoordinateVector.cc
EditPositionDialogController.cc
ParameterEditorController.cc
QGCFileDialogController.cc
QGCGeoBoundingCube.cc
QGCImageProvider.cc
QGroundControlQmlGlobal.cc
QmlObjectListModel.cc
QmlTestWidget.cc
RCChannelMonitorController.cc
ScreenToolsController.cc
)
target_link_libraries(QmlControls
PUBLIC
Qt5::Location
Qt5::SerialPort
Qt5::TextToSpeech
Qt5::Widgets
qgc
)
target_include_directories(QmlControls PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
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