rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-02 19:29:15 +01:00
Code Issues Releases Activity

OP-1879 remove openpilot hardcoding: use $$shell_quote where appropraite

Browse Source
This commit is contained in:
James Duley 2015-05-20 19:37:02 +01:00 committed by LibrePilot Packager
parent 64cd361666
commit 5474583660
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ground/openpilotgcs/src/app/app.pro
View File

@ -20,8 +20,8 @@ include(../libs/version_info/version_info.pri)
LIBS *= -l$$qtLibraryName(ExtensionSystem) -l$$qtLibraryName(Aggregation) LIBS *= -l$$qtLibraryName(ExtensionSystem) -l$$qtLibraryName(Aggregation)
DEFINES += PLUGIN_REL_PATH=\\\"$$relative_path($$GCS_PLUGIN_PATH, $$GCS_APP_PATH)\\\" DEFINES += PLUGIN_REL_PATH=$$shell_quote(\"$$relative_path($$GCS_PLUGIN_PATH, $$GCS_APP_PATH)\")
DEFINES += GCS_NAME=\\\"$$GCS_APP_TARGET\\\" DEFINES += GCS_NAME=$$shell_quote(\"$$GCS_APP_TARGET\")
win32 { win32 {
RC_FILE = openpilotgcs.rc RC_FILE = openpilotgcs.rc
@ -38,8 +38,8 @@ win32 {
} else { } else {
target.path = /bin target.path = /bin
INSTALLS += target INSTALLS += target
QMAKE_RPATHDIR = \'\$$ORIGIN\'/$$relative_path($$GCS_LIBRARY_PATH, $$GCS_APP_PATH) QMAKE_RPATHDIR = $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_LIBRARY_PATH, $$GCS_APP_PATH))
QMAKE_RPATHDIR += \'\$$ORIGIN\'/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_APP_PATH) QMAKE_RPATHDIR += $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_APP_PATH))
include(../rpath.pri) include(../rpath.pri)
equals(copyqt, 1) { equals(copyqt, 1) {

2
ground/openpilotgcs/src/libs/extensionsystem/extensionsystem.pro
View File

@ -6,7 +6,7 @@ include(extensionsystem_dependencies.pri)
unix:!macx:!freebsd*:LIBS += -ldl unix:!macx:!freebsd*:LIBS += -ldl
DEFINES += GCS_TEST_DIR=\\\"$$GCS_SOURCE_TREE\\\" DEFINES += GCS_TEST_DIR=$$shell_quote(\"$$GCS_SOURCE_TREE\")
QT += widgets QT += widgets

2
ground/openpilotgcs/src/libs/utils/utils.pro
View File

@ -13,7 +13,7 @@ DEFINES += QTCREATOR_UTILS_LIB
include(../../openpilotgcslibrary.pri) include(../../openpilotgcslibrary.pri)
DEFINES += DATA_REL_PATH=\\\"$$relative_path($$GCS_DATA_PATH, $$GCS_APP_PATH)\\\" DEFINES += DATA_REL_PATH=$$shell_quote(\"$$relative_path($$GCS_DATA_PATH, $$GCS_APP_PATH)\")
SOURCES += reloadpromptutils.cpp \ SOURCES += reloadpromptutils.cpp \
settingsutils.cpp \ settingsutils.cpp \

4
ground/openpilotgcs/src/openpilotgcslibrary.pri
View File

@ -17,8 +17,8 @@ macx {
target.path = /bin target.path = /bin
target.files = $$DESTDIR/$${TARGET}.dll target.files = $$DESTDIR/$${TARGET}.dll
} else { } else {
QMAKE_RPATHDIR = \'\$$ORIGIN\' QMAKE_RPATHDIR = $$shell_quote(\$$ORIGIN)
QMAKE_RPATHDIR += \'\$$ORIGIN\'/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_LIBRARY_PATH) QMAKE_RPATHDIR += $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_LIBRARY_PATH))
include(rpath.pri) include(rpath.pri)
target.path = /$$GCS_LIBRARY_BASENAME/openpilotgcs target.path = /$$GCS_LIBRARY_BASENAME/openpilotgcs

6
ground/openpilotgcs/src/openpilotgcsplugin.pri
View File

@ -30,9 +30,9 @@ TARGET = $$qtLibraryName($$TARGET)
macx { macx {
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Plugins/$${PROVIDER}/ QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../Plugins/$${PROVIDER}/
} else:linux-* { } else:linux-* {
QMAKE_RPATHDIR = \'\$$ORIGIN\' QMAKE_RPATHDIR = $$shell_quote(\$$ORIGIN)
QMAKE_RPATHDIR += \'\$$ORIGIN\'/$$relative_path($$GCS_LIBRARY_PATH, $$DESTDIR) QMAKE_RPATHDIR += $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_LIBRARY_PATH, $$DESTDIR))
QMAKE_RPATHDIR += \'\$$ORIGIN\'/$$relative_path($$GCS_QT_LIBRARY_PATH, $$DESTDIR) QMAKE_RPATHDIR += $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_QT_LIBRARY_PATH, $$DESTDIR))
include(rpath.pri) include(rpath.pri)
} }