From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Wed, 6 Apr 2011 10:53:58 +0000 (+0200)
Subject: Set the rpath
X-Git-Tag: qt-v5.0.0-alpha1~324
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=62b389ede0163226ee02e15716fa496c232148fc;p=profile%2Fivi%2Fqtwayland.git

Set the rpath

Wayland is currently instaled in non-standard dirs, so set the rpath if
the system supports rpath.

Reviewed-By: Jørgen Lind
---

diff --git a/src/qt-compositor/qt-compositor.pri b/src/qt-compositor/qt-compositor.pri
index c29b7b0..6100bbd 100644
--- a/src/qt-compositor/qt-compositor.pri
+++ b/src/qt-compositor/qt-compositor.pri
@@ -4,6 +4,12 @@ use_pkgconfig {
     #for some reason this is not included in the cflags line
     INCLUDEPATH += $$system(pkg-config --variable=includedir wayland-server)
     LIBS += $$system(pkg-config --libs wayland-server)
+
+    #set the rpath
+    !isEmpty(QMAKE_LFLAGS_RPATH) {
+        WAYLAND_LIBDIR = $$system(pkg-config --variable=libdir wayland-server)
+        !isEmpty(WAYLAND_LIBDIR):QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${WAYLAND_LIBDIR}
+    }
 } else {
     INCLUDEPATH += $$PWD/../3rdparty/wayland
     LIBS += -L$$PWD/../../lib