rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

OP-1174 fixed GCS telemetry build dependency issue

Browse Source
This commit is contained in:
Philippe Renon 2014-05-11 14:20:31 +02:00
parent 4cee34a0ef
commit 40ed1fc570
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/openpilotgcs/src/plugins/plugins.pro
View File

@ -52,8 +52,9 @@ plugin_uavtalk.depends += plugin_coreplugin
# Telemetry plugin
SUBDIRS += plugin_telemetry
plugin_telemetry.subdir = telemetry
plugin_telemetry.depends = plugin_coreplugin
plugin_telemetry.depends += plugin_uavobjectutil
plugin_telemetry.depends += plugin_uavtalk
plugin_telemetry.depends += plugin_coreplugin
# OPMap UAVGadget
plugin_opmap.subdir = opmap
@ -98,9 +99,9 @@ macx:contains(QT_VERSION, ^4\\.8\\.0): CONFIG += disable_notify_plugin
plugin_uploader.subdir = uploader
plugin_uploader.depends = plugin_coreplugin
plugin_uploader.depends += plugin_uavobjects
plugin_uploader.depends += plugin_uavobjectutil
plugin_uploader.depends += plugin_uavtalk
plugin_uploader.depends += plugin_opHID
plugin_uploader.depends += plugin_uavobjectutil
SUBDIRS += plugin_uploader
# Dial gadget

9
ground/openpilotgcs/src/plugins/telemetry/telemetry.pro
View File

@ -1,12 +1,11 @@
TEMPLATE = lib
TARGET = Telemetry
DEFINES += TELEMETRY_LIBRARY
QT += svg
include(../../openpilotgcsplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../libs/version_info/version_info.pri)
include(telemetry_dependencies.pri)
include(../../libs/version_info/version_info.pri)
HEADERS += telemetry_global.h \
telemetryplugin.h \
@ -23,8 +22,6 @@ SOURCES += telemetryplugin.cpp \
monitorgadgetfactory.cpp \
monitorgadgetoptionspage.cpp
DEFINES += TELEMETRY_LIBRARY
OTHER_FILES += Telemetry.pluginspec
RESOURCES += telemetry.qrc
OTHER_FILES += Telemetry.pluginspec

4
ground/openpilotgcs/src/plugins/telemetry/telemetry_dependencies.pri
View File

@ -1,4 +1,4 @@
include(../../plugins/uavobjects/uavobjects.pri)
include(../../openpilotgcsplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/uavobjectutil/uavobjectutil.pri)
include(../../plugins/uavtalk/uavtalk.pri)

5
ground/openpilotgcs/src/plugins/uploader/uploader.pro
View File

@ -46,15 +46,14 @@ SOURCES += uploadergadget.cpp \
SSP/qsspt.cpp \
runningdevicewidget.cpp
OTHER_FILES += Uploader.pluginspec \
OTHER_FILES += Uploader.pluginspec
FORMS += \
uploader.ui \
devicewidget.ui \
runningdevicewidget.ui
RESOURCES += \
uploader.qrc
RESOURCES += uploader.qrc
exists( ../../../../../build/openpilotgcs-synthetics/opfw_resource.qrc ) {
RESOURCES += ../../../../../build/openpilotgcs-synthetics/opfw_resource.qrc