Set the rpath
authorHarald Fernengel <harald.fernengel@nokia.com>
Wed, 6 Apr 2011 10:53:58 +0000 (12:53 +0200)
committerHarald Fernengel <harald.fernengel@nokia.com>
Wed, 6 Apr 2011 10:55:10 +0000 (12:55 +0200)
Wayland is currently instaled in non-standard dirs, so set the rpath if
the system supports rpath.

Reviewed-By: Jørgen Lind
src/qt-compositor/qt-compositor.pri

index c29b7b0..6100bbd 100644 (file)
@@ -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