mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-11-29 07:24:13 +01:00
More clean up and prep.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@155 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
dankers
dankers
parent
ea3db356e5
commit
485e023c16
@ -1,12 +1,12 @@
|
||||
TEMPLATE = lib
|
||||
TARGET = Aggregation
|
||||
|
||||
include(../../qtcreatorlibrary.pri)
|
||||
|
||||
DEFINES += AGGREGATION_LIBRARY
|
||||
|
||||
HEADERS = aggregate.h \
|
||||
aggregation_global.h
|
||||
|
||||
SOURCES = aggregate.cpp
|
||||
|
||||
TEMPLATE = lib
|
||||
TARGET = Aggregation
|
||||
|
||||
include(../../openpilotgcslibrary.pri)
|
||||
|
||||
DEFINES += AGGREGATION_LIBRARY
|
||||
|
||||
HEADERS = aggregate.h \
|
||||
aggregation_global.h
|
||||
|
||||
SOURCES = aggregate.cpp
|
||||
|
||||
|
||||
@ -1,33 +1,33 @@
|
||||
TEMPLATE = lib
|
||||
TARGET = ExtensionSystem
|
||||
DEFINES += EXTENSIONSYSTEM_LIBRARY
|
||||
include(../../qtcreatorlibrary.pri)
|
||||
include(extensionsystem_dependencies.pri)
|
||||
|
||||
unix:!macx:!freebsd*:LIBS += -ldl
|
||||
|
||||
DEFINES += IDE_TEST_DIR=\\\"$$IDE_SOURCE_TREE\\\"
|
||||
|
||||
HEADERS += pluginerrorview.h \
|
||||
plugindetailsview.h \
|
||||
iplugin.h \
|
||||
iplugin_p.h \
|
||||
extensionsystem_global.h \
|
||||
pluginmanager.h \
|
||||
pluginmanager_p.h \
|
||||
pluginspec.h \
|
||||
pluginspec_p.h \
|
||||
pluginview.h \
|
||||
pluginview_p.h \
|
||||
optionsparser.h
|
||||
SOURCES += pluginerrorview.cpp \
|
||||
plugindetailsview.cpp \
|
||||
iplugin.cpp \
|
||||
pluginmanager.cpp \
|
||||
pluginspec.cpp \
|
||||
pluginview.cpp \
|
||||
optionsparser.cpp
|
||||
FORMS += pluginview.ui \
|
||||
pluginerrorview.ui \
|
||||
plugindetailsview.ui
|
||||
RESOURCES += pluginview.qrc
|
||||
TEMPLATE = lib
|
||||
TARGET = ExtensionSystem
|
||||
DEFINES += EXTENSIONSYSTEM_LIBRARY
|
||||
include(../../openpilotgcslibrary.pri)
|
||||
include(extensionsystem_dependencies.pri)
|
||||
|
||||
unix:!macx:!freebsd*:LIBS += -ldl
|
||||
|
||||
DEFINES += IDE_TEST_DIR=\\\"$$IDE_SOURCE_TREE\\\"
|
||||
|
||||
HEADERS += pluginerrorview.h \
|
||||
plugindetailsview.h \
|
||||
iplugin.h \
|
||||
iplugin_p.h \
|
||||
extensionsystem_global.h \
|
||||
pluginmanager.h \
|
||||
pluginmanager_p.h \
|
||||
pluginspec.h \
|
||||
pluginspec_p.h \
|
||||
pluginview.h \
|
||||
pluginview_p.h \
|
||||
optionsparser.h
|
||||
SOURCES += pluginerrorview.cpp \
|
||||
plugindetailsview.cpp \
|
||||
iplugin.cpp \
|
||||
pluginmanager.cpp \
|
||||
pluginspec.cpp \
|
||||
pluginview.cpp \
|
||||
optionsparser.cpp
|
||||
FORMS += pluginview.ui \
|
||||
pluginerrorview.ui \
|
||||
plugindetailsview.ui
|
||||
RESOURCES += pluginview.qrc
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
TEMPLATE = lib
|
||||
TARGET = QtConcurrent
|
||||
DEFINES += BUILD_QTCONCURRENT
|
||||
|
||||
include(../../qtcreatorlibrary.pri)
|
||||
|
||||
HEADERS += \
|
||||
qtconcurrent_global.h \
|
||||
multitask.h \
|
||||
runextensions.h
|
||||
TEMPLATE = lib
|
||||
TARGET = QtConcurrent
|
||||
DEFINES += BUILD_QTCONCURRENT
|
||||
|
||||
include(../../openpilotgcslibrary.pri)
|
||||
|
||||
HEADERS += \
|
||||
qtconcurrent_global.h \
|
||||
multitask.h \
|
||||
runextensions.h
|
||||
|
||||
@ -1,89 +1,89 @@
|
||||
TEMPLATE = lib
|
||||
TARGET = Utils
|
||||
QT += gui \
|
||||
network
|
||||
DEFINES += QTCREATOR_UTILS_LIB
|
||||
include(../../qtcreatorlibrary.pri)
|
||||
SOURCES += reloadpromptutils.cpp \
|
||||
settingsutils.cpp \
|
||||
filesearch.cpp \
|
||||
pathchooser.cpp \
|
||||
pathlisteditor.cpp \
|
||||
filewizardpage.cpp \
|
||||
filewizarddialog.cpp \
|
||||
projectintropage.cpp \
|
||||
basevalidatinglineedit.cpp \
|
||||
filenamevalidatinglineedit.cpp \
|
||||
projectnamevalidatinglineedit.cpp \
|
||||
codegeneration.cpp \
|
||||
newclasswidget.cpp \
|
||||
classnamevalidatinglineedit.cpp \
|
||||
linecolumnlabel.cpp \
|
||||
fancylineedit.cpp \
|
||||
qtcolorbutton.cpp \
|
||||
savedaction.cpp \
|
||||
submiteditorwidget.cpp \
|
||||
synchronousprocess.cpp \
|
||||
submitfieldwidget.cpp \
|
||||
consoleprocess.cpp \
|
||||
uncommentselection.cpp \
|
||||
parameteraction.cpp \
|
||||
treewidgetcolumnstretcher.cpp \
|
||||
checkablemessagebox.cpp \
|
||||
styledbar.cpp \
|
||||
stylehelper.cpp \
|
||||
welcomemodetreewidget.cpp \
|
||||
iwelcomepage.cpp \
|
||||
fancymainwindow.cpp \
|
||||
detailsbutton.cpp \
|
||||
detailswidget.cpp
|
||||
win32 {
|
||||
SOURCES += abstractprocess_win.cpp \
|
||||
consoleprocess_win.cpp \
|
||||
winutils.cpp
|
||||
HEADERS += winutils.h
|
||||
}
|
||||
else:SOURCES += consoleprocess_unix.cpp
|
||||
HEADERS += utils_global.h \
|
||||
reloadpromptutils.h \
|
||||
settingsutils.h \
|
||||
filesearch.h \
|
||||
listutils.h \
|
||||
pathchooser.h \
|
||||
pathlisteditor.h \
|
||||
filewizardpage.h \
|
||||
filewizarddialog.h \
|
||||
projectintropage.h \
|
||||
basevalidatinglineedit.h \
|
||||
filenamevalidatinglineedit.h \
|
||||
projectnamevalidatinglineedit.h \
|
||||
codegeneration.h \
|
||||
newclasswidget.h \
|
||||
classnamevalidatinglineedit.h \
|
||||
linecolumnlabel.h \
|
||||
fancylineedit.h \
|
||||
qtcolorbutton.h \
|
||||
savedaction.h \
|
||||
submiteditorwidget.h \
|
||||
abstractprocess.h \
|
||||
consoleprocess.h \
|
||||
synchronousprocess.h \
|
||||
submitfieldwidget.h \
|
||||
uncommentselection.h \
|
||||
parameteraction.h \
|
||||
treewidgetcolumnstretcher.h \
|
||||
checkablemessagebox.h \
|
||||
qtcassert.h \
|
||||
styledbar.h \
|
||||
stylehelper.h \
|
||||
welcomemodetreewidget.h \
|
||||
iwelcomepage.h \
|
||||
fancymainwindow.h \
|
||||
detailsbutton.h \
|
||||
detailswidget.h
|
||||
FORMS += filewizardpage.ui \
|
||||
projectintropage.ui \
|
||||
newclasswidget.ui \
|
||||
submiteditorwidget.ui \
|
||||
checkablemessagebox.ui
|
||||
RESOURCES += utils.qrc
|
||||
TEMPLATE = lib
|
||||
TARGET = Utils
|
||||
QT += gui \
|
||||
network
|
||||
DEFINES += QTCREATOR_UTILS_LIB
|
||||
include(../../openpilotgcslibrary.pri)
|
||||
SOURCES += reloadpromptutils.cpp \
|
||||
settingsutils.cpp \
|
||||
filesearch.cpp \
|
||||
pathchooser.cpp \
|
||||
pathlisteditor.cpp \
|
||||
filewizardpage.cpp \
|
||||
filewizarddialog.cpp \
|
||||
projectintropage.cpp \
|
||||
basevalidatinglineedit.cpp \
|
||||
filenamevalidatinglineedit.cpp \
|
||||
projectnamevalidatinglineedit.cpp \
|
||||
codegeneration.cpp \
|
||||
newclasswidget.cpp \
|
||||
classnamevalidatinglineedit.cpp \
|
||||
linecolumnlabel.cpp \
|
||||
fancylineedit.cpp \
|
||||
qtcolorbutton.cpp \
|
||||
savedaction.cpp \
|
||||
submiteditorwidget.cpp \
|
||||
synchronousprocess.cpp \
|
||||
submitfieldwidget.cpp \
|
||||
consoleprocess.cpp \
|
||||
uncommentselection.cpp \
|
||||
parameteraction.cpp \
|
||||
treewidgetcolumnstretcher.cpp \
|
||||
checkablemessagebox.cpp \
|
||||
styledbar.cpp \
|
||||
stylehelper.cpp \
|
||||
welcomemodetreewidget.cpp \
|
||||
iwelcomepage.cpp \
|
||||
fancymainwindow.cpp \
|
||||
detailsbutton.cpp \
|
||||
detailswidget.cpp
|
||||
win32 {
|
||||
SOURCES += abstractprocess_win.cpp \
|
||||
consoleprocess_win.cpp \
|
||||
winutils.cpp
|
||||
HEADERS += winutils.h
|
||||
}
|
||||
else:SOURCES += consoleprocess_unix.cpp
|
||||
HEADERS += utils_global.h \
|
||||
reloadpromptutils.h \
|
||||
settingsutils.h \
|
||||
filesearch.h \
|
||||
listutils.h \
|
||||
pathchooser.h \
|
||||
pathlisteditor.h \
|
||||
filewizardpage.h \
|
||||
filewizarddialog.h \
|
||||
projectintropage.h \
|
||||
basevalidatinglineedit.h \
|
||||
filenamevalidatinglineedit.h \
|
||||
projectnamevalidatinglineedit.h \
|
||||
codegeneration.h \
|
||||
newclasswidget.h \
|
||||
classnamevalidatinglineedit.h \
|
||||
linecolumnlabel.h \
|
||||
fancylineedit.h \
|
||||
qtcolorbutton.h \
|
||||
savedaction.h \
|
||||
submiteditorwidget.h \
|
||||
abstractprocess.h \
|
||||
consoleprocess.h \
|
||||
synchronousprocess.h \
|
||||
submitfieldwidget.h \
|
||||
uncommentselection.h \
|
||||
parameteraction.h \
|
||||
treewidgetcolumnstretcher.h \
|
||||
checkablemessagebox.h \
|
||||
qtcassert.h \
|
||||
styledbar.h \
|
||||
stylehelper.h \
|
||||
welcomemodetreewidget.h \
|
||||
iwelcomepage.h \
|
||||
fancymainwindow.h \
|
||||
detailsbutton.h \
|
||||
detailswidget.h
|
||||
FORMS += filewizardpage.ui \
|
||||
projectintropage.ui \
|
||||
newclasswidget.ui \
|
||||
submiteditorwidget.ui \
|
||||
checkablemessagebox.ui
|
||||
RESOURCES += utils.qrc
|
||||
|
||||
@ -43,8 +43,8 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
|
||||
CONFIG += plugin plugin_with_soname
|
||||
|
||||
!macx {
|
||||
target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
|
||||
target.path = /$$IDE_LIBRARY_BASENAME/opnepilotgcs/plugins/$$PROVIDER
|
||||
pluginspec.files += $${TARGET}.pluginspec
|
||||
pluginspec.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
|
||||
pluginspec.path = /$$IDE_LIBRARY_BASENAME/openpilotgcs/plugins/$$PROVIDER
|
||||
INSTALLS += target pluginspec
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
macx {
|
||||
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/
|
||||
} else:linux-* {
|
||||
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
|
||||
# this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
|
||||
QMAKE_RPATHDIR += \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator
|
||||
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
|
||||
|
||||
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
|
||||
QMAKE_RPATHDIR =
|
||||
}
|
||||
macx {
|
||||
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/
|
||||
} else:linux-* {
|
||||
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
|
||||
# this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
|
||||
QMAKE_RPATHDIR += \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/openpilotgcs
|
||||
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
|
||||
|
||||
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
|
||||
QMAKE_RPATHDIR =
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user