diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-11-13 10:55:30 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-11-16 09:42:41 +0000 |
| commit | 126d3ecc9dda002304dd3143651c0b799118d18f (patch) | |
| tree | e620f1fee0b68a5a7eea37f682d1d927ad147d3b /static-res.pro | |
| parent | 13950241c7597ede4c1395824aa033260b418033 (diff) | |
Fix qmake build with disabled rpath
Fixes: QBS-1340
Change-Id: I3898929c28cf7061aab7f85c4b533032e4425c42
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'static-res.pro')
| -rw-r--r-- | static-res.pro | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/static-res.pro b/static-res.pro index a01b3a83b..86816bbf0 100644 --- a/static-res.pro +++ b/static-res.pro @@ -3,6 +3,18 @@ TEMPLATE = aux !isEmpty(QBS_APPS_DESTDIR): qbsbindir = $${QBS_APPS_DESTDIR} else: qbsbindir = bin +envSpec = +unix:qbs_disable_rpath { + !isEmpty(QBS_DESTDIR): qbslibdir = $$QBS_DESTDIR + else: qbslibdir = $$OUT_PWD/lib + macos: envVar = DYLD_LIBRARY_PATH + else: envVar = LD_LIBRARY_PATH + oldVal = $$getenv($$envVar) + newVal = $$qbslibdir + !isEmpty(oldVal): newVal = $$newVal:$$oldVal + envSpec = $$envVar=$$newVal +} + builddirname = qbsres typedescdir = share/qbs/qml-type-descriptions typedescdir_src = $$builddirname/default/install-root/$$typedescdir @@ -15,7 +27,7 @@ else: \ qbsres.target = $$builddirname/default/default.bg qbsres.commands = \ - $$shell_quote($$shell_path($$qbsbindir/qbs)) \ + $$envSpec $$shell_quote($$shell_path($$qbsbindir/qbs)) \ build \ --settings-dir $$shell_quote($$builddirname/settings) \ -f $$shell_quote($$PWD/qbs.qbs) \ |