diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-22 12:49:23 +0100 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-22 12:50:02 +0100 |
| commit | 88c158e4b69a080275a2d114544ba81b807afd7d (patch) | |
| tree | ca6087f564ffe1f15827246bd6518c94ab4be0cd /src/3rdparty | |
| parent | fe2a6c64bfedfd1df946ad379131847900d821c7 (diff) | |
Adding destination directory for wayland build
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/wayland/client/client.pro | 1 | ||||
| -rw-r--r-- | src/3rdparty/wayland/server/server.pro | 1 | ||||
| -rw-r--r-- | src/3rdparty/wayland/shared.pri | 7 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/3rdparty/wayland/client/client.pro b/src/3rdparty/wayland/client/client.pro index 71af897a5..c2c5eccce 100644 --- a/src/3rdparty/wayland/client/client.pro +++ b/src/3rdparty/wayland/client/client.pro @@ -1,6 +1,5 @@ TEMPLATE = lib TARGET = wayland-client -DESTDIR=$$PWD/../../../../lib/ CONFIG -= qt CONFIG += shared diff --git a/src/3rdparty/wayland/server/server.pro b/src/3rdparty/wayland/server/server.pro index da2bf3643..0898b443d 100644 --- a/src/3rdparty/wayland/server/server.pro +++ b/src/3rdparty/wayland/server/server.pro @@ -1,6 +1,5 @@ TEMPLATE = lib TARGET = wayland-server -DESTDIR=$$PWD/../../../../lib/ CONFIG -= qt CONFIG += shared diff --git a/src/3rdparty/wayland/shared.pri b/src/3rdparty/wayland/shared.pri index 44194dca7..a8b369500 100644 --- a/src/3rdparty/wayland/shared.pri +++ b/src/3rdparty/wayland/shared.pri @@ -1,5 +1,12 @@ INCLUDEPATH += $$PWD +WAYLAND_INSTALL_DIR = $$(WAYLAND_INSTALL_DIR) +isEmpty(WAYLAND_INSTALL_DIR) { + DESTDIR=$$PWD/../../../lib/ +} else { + DESTDIR=$$WAYLAND_INSTALL_DIR +} + use_pkgconfig { CONFIG += link_pkgconfig PKGCONFIG += libffi |