rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

GCS: fix plugin build dependencies

Browse Source 
They should reflect the pro/pri files included and be sufficient to
build. Chained dependencies should be built by the make system.
This commit is contained in:
Oleg Semyonov 2012-10-09 21:47:47 +03:00
parent d1b78faeb3
commit d60be79133
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,6 @@ SUBDIRS = plugin_coreplugin
#plugin_donothing.subdir = donothing #plugin_donothing.subdir = donothing
#plugin_donothing.depends = plugin_coreplugin #plugin_donothing.depends = plugin_coreplugin
# Core plugin # Core plugin
plugin_coreplugin.subdir = coreplugin plugin_coreplugin.subdir = coreplugin
@ -55,12 +54,14 @@ plugin_opmap.subdir = opmap
plugin_opmap.depends = plugin_coreplugin plugin_opmap.depends = plugin_coreplugin
plugin_opmap.depends += plugin_uavobjects plugin_opmap.depends += plugin_uavobjects
plugin_opmap.depends += plugin_uavobjectutil plugin_opmap.depends += plugin_uavobjectutil
plugin_opmap.depends += plugin_uavtalk
SUBDIRS += plugin_opmap SUBDIRS += plugin_opmap
# Scope UAVGadget # Scope UAVGadget
plugin_scope.subdir = scope plugin_scope.subdir = scope
plugin_scope.depends = plugin_coreplugin plugin_scope.depends = plugin_coreplugin
plugin_scope.depends += plugin_uavobjects plugin_scope.depends += plugin_uavobjects
plugin_scope.depends += plugin_uavtalk
SUBDIRS += plugin_scope SUBDIRS += plugin_scope
# UAVObject Browser gadget # UAVObject Browser gadget
@ -75,15 +76,15 @@ plugin_modelview.depends = plugin_coreplugin
plugin_modelview.depends += plugin_uavobjects plugin_modelview.depends += plugin_uavobjects
SUBDIRS += plugin_modelview SUBDIRS += plugin_modelview
#Qt 4.8.0 / phonon may crash on Mac, fixed in Qt 4.8.1, QTBUG-23128 #Qt 4.8.0 / phonon may crash on Mac, fixed in Qt 4.8.1, QTBUG-23128
macx:contains(QT_VERSION, ^4\\.8\\.0): CONFIG += disable_notify_plugin macx:contains(QT_VERSION, ^4\\.8\\.0): CONFIG += disable_notify_plugin
!disable_notify_plugin {
# Notify gadget # Notify gadget
!disable_notify_plugin {
plugin_notify.subdir = notify plugin_notify.subdir = notify
plugin_notify.depends = plugin_coreplugin plugin_notify.depends = plugin_coreplugin
plugin_notify.depends += plugin_uavobjects plugin_notify.depends += plugin_uavobjects
plugin_notify.depends += plugin_uavtalk
SUBDIRS += plugin_notify SUBDIRS += plugin_notify
} }
@ -91,6 +92,7 @@ SUBDIRS += plugin_notify
plugin_uploader.subdir = uploader plugin_uploader.subdir = uploader
plugin_uploader.depends = plugin_coreplugin plugin_uploader.depends = plugin_coreplugin
plugin_uploader.depends += plugin_uavobjects plugin_uploader.depends += plugin_uavobjects
plugin_uploader.depends += plugin_uavtalk
plugin_uploader.depends += plugin_rawhid plugin_uploader.depends += plugin_rawhid
plugin_uploader.depends += plugin_uavobjectutil plugin_uploader.depends += plugin_uavobjectutil
SUBDIRS += plugin_uploader SUBDIRS += plugin_uploader
@ -117,7 +119,9 @@ SUBDIRS += plugin_systemhealth
# Config gadget # Config gadget
plugin_config.subdir = config plugin_config.subdir = config
plugin_config.depends = plugin_coreplugin plugin_config.depends = plugin_coreplugin
plugin_config.depends += plugin_uavtalk
plugin_config.depends += plugin_uavobjects plugin_config.depends += plugin_uavobjects
plugin_config.depends += plugin_uavobjectutil
plugin_config.depends += plugin_uavobjectwidgetutils plugin_config.depends += plugin_uavobjectwidgetutils
plugin_config.depends += plugin_uavsettingsimportexport plugin_config.depends += plugin_uavsettingsimportexport
SUBDIRS += plugin_config SUBDIRS += plugin_config
@ -125,7 +129,7 @@ SUBDIRS += plugin_config
# GPS Display gadget # GPS Display gadget
plugin_gpsdisplay.subdir = gpsdisplay plugin_gpsdisplay.subdir = gpsdisplay
plugin_gpsdisplay.depends = plugin_coreplugin plugin_gpsdisplay.depends = plugin_coreplugin
plugin_gpsdisplay.depends += plugin_uavtalk plugin_gpsdisplay.depends += plugin_uavobjects
SUBDIRS += plugin_gpsdisplay SUBDIRS += plugin_gpsdisplay
# Primary Flight Display (PFD) gadget # Primary Flight Display (PFD) gadget
@ -182,13 +186,12 @@ SUBDIRS += plugin_logging
plugin_gcscontrol.subdir = gcscontrol plugin_gcscontrol.subdir = gcscontrol
plugin_gcscontrol.depends = plugin_coreplugin plugin_gcscontrol.depends = plugin_coreplugin
plugin_gcscontrol.depends += plugin_uavobjects plugin_gcscontrol.depends += plugin_uavobjects
plugin_gcscontrol.depends += plugin_uavtalk
SUBDIRS += plugin_gcscontrol SUBDIRS += plugin_gcscontrol
# Antenna tracker # Antenna tracker
#plugin_antennatrack.subdir = antennatrack #plugin_antennatrack.subdir = antennatrack
#plugin_antennatrack.depends = plugin_coreplugin #plugin_antennatrack.depends = plugin_coreplugin
#plugin_antennatrack.depends += plugin_uavtalk #plugin_antennatrack.depends += plugin_uavobjects
#SUBDIRS += plugin_antennatrack #SUBDIRS += plugin_antennatrack
# Scope OpenGL Gadget # Scope OpenGL Gadget
@ -213,6 +216,7 @@ SUBDIRS += plugin_magicwaypoint
plugin_uavsettingsimportexport.subdir = uavsettingsimportexport plugin_uavsettingsimportexport.subdir = uavsettingsimportexport
plugin_uavsettingsimportexport.depends = plugin_coreplugin plugin_uavsettingsimportexport.depends = plugin_coreplugin
plugin_uavsettingsimportexport.depends += plugin_uavobjects plugin_uavsettingsimportexport.depends += plugin_uavobjects
plugin_uavsettingsimportexport.depends += plugin_uavobjectutil
SUBDIRS += plugin_uavsettingsimportexport SUBDIRS += plugin_uavsettingsimportexport
# UAV Object Widget Utility plugin # UAV Object Widget Utility plugin
@ -221,12 +225,13 @@ plugin_uavobjectwidgetutils.depends = plugin_coreplugin
plugin_uavobjectwidgetutils.depends += plugin_uavobjects plugin_uavobjectwidgetutils.depends += plugin_uavobjects
plugin_uavobjectwidgetutils.depends += plugin_uavobjectutil plugin_uavobjectwidgetutils.depends += plugin_uavobjectutil
plugin_uavobjectwidgetutils.depends += plugin_uavsettingsimportexport plugin_uavobjectwidgetutils.depends += plugin_uavsettingsimportexport
plugin_uavobjectwidgetutils.depends += plugin_uavtalk
SUBDIRS += plugin_uavobjectwidgetutils SUBDIRS += plugin_uavobjectwidgetutils
# Setup Wizard plugin # Setup Wizard plugin
plugin_setupwizard.subdir = setupwizard plugin_setupwizard.subdir = setupwizard
plugin_setupwizard.depends = plugin_coreplugin plugin_setupwizard.depends = plugin_coreplugin
plugin_setupwizard.depends += plugin_uavobjects plugin_setupwizard.depends += plugin_uavobjectutil
plugin_setupwizard.depends += plugin_config plugin_setupwizard.depends += plugin_config
SUBDIRS += plugin_setupwizard SUBDIRS += plugin_setupwizard

6
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils_dependencies.pri
View File

@ -1,6 +1,6 @@
include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/coreplugin/coreplugin.pri)
include(../../libs/utils/utils.pri) include(../../libs/utils/utils.pri)
include(../../plugins/uavobjects/uavobjects.pri) include(../../plugins/uavobjects/uavobjects.pri)
include(../uavobjectutil/uavobjectutil.pri) include(../../plugins/uavobjectutil/uavobjectutil.pri)
include(../uavsettingsimportexport/uavsettingsimportexport.pri) include(../../plugins/uavsettingsimportexport/uavsettingsimportexport.pri)
include(../uavtalk/uavtalk.pri) include(../../plugins/uavtalk/uavtalk.pri)