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

OP-1654 fix linux rpath: removed hardcoded QMAKE_RPATHDIR

Browse Source
This commit is contained in:
James Duley 2014-12-29 09:04:47 +13:00
parent fea74125fa
commit fa7196ddec
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,8 +30,8 @@ win32 {
} else {
target.path = /bin
INSTALLS += target
QMAKE_RPATHDIR = \'\$$ORIGIN\'/../$$GCS_LIBRARY_BASENAME/openpilotgcs
QMAKE_RPATHDIR += \'\$$ORIGIN\'/../$$GCS_LIBRARY_BASENAME/qt5
QMAKE_RPATHDIR = \'\$$ORIGIN\'/$$relative_path($$GCS_LIBRARY_PATH, $$GCS_APP_PATH)
QMAKE_RPATHDIR += \'\$$ORIGIN\'/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_APP_PATH)
include(../rpath.pri)
}

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

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

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

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