From e7436823116b1eacb7742a0596ddb8ee93c4b981 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Sat, 12 Sep 2015 18:19:57 +0200 Subject: [PATCH] LP-29 moved osg RPATHDIR definition to libs/osgearth/osgearth.pro --- ground/gcs/src/library.pri | 1 - ground/gcs/src/libs/osgearth/osgearth.pro | 7 ++++++- ground/gcs/src/plugin.pri | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ground/gcs/src/library.pri b/ground/gcs/src/library.pri index a57a8f308..3120d28ce 100644 --- a/ground/gcs/src/library.pri +++ b/ground/gcs/src/library.pri @@ -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 diff --git a/ground/gcs/src/libs/osgearth/osgearth.pro b/ground/gcs/src/libs/osgearth/osgearth.pro index 7a8007e9a..0f0f3aae5 100644 --- a/ground/gcs/src/libs/osgearth/osgearth.pro +++ b/ground/gcs/src/libs/osgearth/osgearth.pro @@ -6,12 +6,17 @@ DEFINES += OSGEARTH_LIBRARY QT += widgets opengl qml quick contains(DEFINES, OSG_USE_QT_PRIVATE) { - QT += core-private gui-private + QT += core-private gui-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 diff --git a/ground/gcs/src/plugin.pri b/ground/gcs/src/plugin.pri index 33548c23f..ea4764a9e 100644 --- a/ground/gcs/src/plugin.pri +++ b/ground/gcs/src/plugin.pri @@ -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) }