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

LP-29 moved osg RPATHDIR definition to libs/osgearth/osgearth.pro

Browse Source
This commit is contained in:
Philippe Renon 2015-09-12 18:19:57 +02:00
parent 466f4bb695
commit e743682311
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/gcs/src/library.pri
View File

@ -19,7 +19,6 @@ macx {
} else {
QMAKE_RPATHDIR = $$shell_quote(\$$ORIGIN)
QMAKE_RPATHDIR += $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_QT_LIBRARY_PATH, $$GCS_LIBRARY_PATH))
QMAKE_RPATHDIR += $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_LIBRARY_PATH/osg, $$GCS_LIBRARY_PATH))
include(rpath.pri)
target.path = /$$GCS_LIBRARY_BASENAME/gcs

5
ground/gcs/src/libs/osgearth/osgearth.pro
View File

@ -12,6 +12,11 @@ contains(DEFINES, OSG_USE_QT_PRIVATE) {
include(../../library.pri)
include(../utils/utils.pri)
linux {
QMAKE_RPATHDIR = $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_LIBRARY_PATH/osg, $$GCS_LIBRARY_PATH))
include(../../rpath.pri)
}
# disable all warnings on mac to avoid build failures
macx:CONFIG += warn_off

1
ground/gcs/src/plugin.pri
View File

@ -31,7 +31,6 @@ macx {
QMAKE_RPATHDIR = $$shell_quote(\$$ORIGIN)
QMAKE_RPATHDIR += $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_LIBRARY_PATH, $$DESTDIR))
QMAKE_RPATHDIR += $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_QT_LIBRARY_PATH, $$DESTDIR))
QMAKE_RPATHDIR += $$shell_quote(\$$ORIGIN/$$relative_path($$GCS_LIBRARY_PATH/osg, $$DESTDIR))
include(rpath.pri)
}