Include Mac OS X platform in installer project

refs #615
This commit is contained in:
Roland Winklmeier
2016-04-10 23:52:27 +02:00
parent 59551c0f1b
commit 45b0503896
21 changed files with 121 additions and 51 deletions

View File

@@ -5,11 +5,24 @@
equals (TEMPLATE, lib) {
# Uncomment line below to supress the default RPATH
# QMAKE_LFLAGS_RPATH =
QMAKE_LFLAGS *= '-Wl,-rpath,\'\$$ORIGIN\''
macx: QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
else:unix: QMAKE_LFLAGS *= '-Wl,-rpath,\'\$$ORIGIN\''
}
equals (TEMPLATE, app) {
QMAKE_LFLAGS *= '-Wl,-rpath,\'\$$ORIGIN/../lib\''
# Uncomment line below to supress the default RPATH
# QMAKE_LFLAGS_RPATH =
# Add rpath to externals to run tests without installing.
# DYLD_LIBRARY_PATH isn't working anymore since OS X 10.11.
unix: QMAKE_LFLAGS *= '-Wl,-rpath,\'$$EXTERNALSDIR\''
macx {
contains(CONFIG, app_bundle): QMAKE_LFLAGS *= -Wl,-rpath,@executable_path/../../../../lib/
else: QMAKE_LFLAGS *= -Wl,-rpath,@executable_path/../lib/
}
else:unix: QMAKE_LFLAGS *= '-Wl,-rpath,\'\$$ORIGIN/../lib\''
}
################################

View File

@@ -3,7 +3,7 @@ LIBS *= -L$$DestRoot/lib
unix:!macx {
# Set the rpath-link to find dependent shared libraries when linking
# Note: This does not add any rpath into the binaries.
LIBS += -Wl,-rpath-link,$$DestRoot/lib
LIBS += -Wl,-rpath-link,$$DestRoot/lib -Wl,-rpath-link,$$[QT_INSTALL_LIBS]
}
blackgui {