From 13bc18c45f14c3b8af06852eb9235f0a5ede1718 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Sat, 29 Aug 2015 19:50:59 +0200 Subject: [PATCH] LP-29 added back osg library dir to RPATHDIR --- ground/gcs/src/library.pri | 1 + ground/gcs/src/plugin.pri | 1 + 2 files changed, 2 insertions(+) diff --git a/ground/gcs/src/library.pri b/ground/gcs/src/library.pri index 3120d28ce..a57a8f308 100644 --- a/ground/gcs/src/library.pri +++ b/ground/gcs/src/library.pri @@ -19,6 +19,7 @@ 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 diff --git a/ground/gcs/src/plugin.pri b/ground/gcs/src/plugin.pri index ea4764a9e..33548c23f 100644 --- a/ground/gcs/src/plugin.pri +++ b/ground/gcs/src/plugin.pri @@ -31,6 +31,7 @@ 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) }