1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use absolute rpath to Qt libraries for non-prefix builds

Browse Source 
Task-number: QTBUG-46391
Change-Id: Iaebba29c340fb027e23a0923f3692d47f9d450d5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
This commit is contained in:
Tor Arne Vestbø 2015-06-03 14:05:56 +02:00 committed by Jani Heikkinen
parent 769cc4d878
commit ef4ef2884d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mkspecs/features/mac/default_post.prf
View File

@ -40,15 +40,13 @@ qt:!isEmpty(QT_CONFIG) {
# libraries. This applies only to apps, since all loaded libraries inherit # libraries. This applies only to apps, since all loaded libraries inherit
# rpaths from current process executable. # rpaths from current process executable.
else:!if(host_build:force_bootstrap):equals(TEMPLATE, app):!defined(QMAKE_RPATHDIR, var):contains(QT_CONFIG, rpath) { else:!if(host_build:force_bootstrap):equals(TEMPLATE, app):!defined(QMAKE_RPATHDIR, var):contains(QT_CONFIG, rpath) {
# If app is outside of Qt SDK prefix use absolute path to Qt libraries, # If app is expected to be installed into the Qt prefix build, use
# otherwise make it relative, so all SDK tools and examples work when # relative path, so all SDK tools and examples work when relocated.
# relocated. prefix_build:defined(target.path, var):\
contains(target.path, "$$re_escape($$[QT_INSTALL_PREFIX])/.*"):\
# Tests are an exception, since they are launched in their build not # Tests are an exception, since they are launched in their build not
# install location by CI, so we cannot use relative rpaths there. # install location by CI, so we cannot use relative rpaths there.
if(!contains(target.path, "$$re_escape($$[QT_INSTALL_PREFIX])/.*")|\ !contains(target.path, "$$re_escape($$[QT_INSTALL_TESTS])/.*") {
contains(target.path, "$$re_escape($$[QT_INSTALL_TESTS])/.*")) {
QMAKE_RPATHDIR = $$[QT_INSTALL_LIBS]
} else {
app_bundle { app_bundle {
ios: binpath = $$target.path/$${TARGET}.app ios: binpath = $$target.path/$${TARGET}.app
else: binpath = $$target.path/$${TARGET}.app/Contents/MacOS else: binpath = $$target.path/$${TARGET}.app/Contents/MacOS
@ -57,6 +55,9 @@ qt:!isEmpty(QT_CONFIG) {
} }
QMAKE_RPATHDIR = @loader_path/$$relative_path($$[QT_INSTALL_LIBS], $$binpath) QMAKE_RPATHDIR = @loader_path/$$relative_path($$[QT_INSTALL_LIBS], $$binpath)
unset(binpath) unset(binpath)
} else {
# Otherwise, use absolute path to Qt libraries
QMAKE_RPATHDIR = $$[QT_INSTALL_LIBS]
} }
} }
} }