Install crashpad binaries

refs #490
This commit is contained in:
Roland Winklmeier
2016-08-01 22:36:56 +02:00
parent 080e22fa4a
commit a87a4a7ef1
4 changed files with 35 additions and 10 deletions

View File

@@ -16,7 +16,7 @@ equals (TEMPLATE, app) {
# 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\''
unix: QMAKE_LFLAGS *= '-Wl,-rpath,\'$$EXTERNALS_LIB_DIR\''
macx {
contains(CONFIG, app_bundle): QMAKE_LFLAGS *= -Wl,-rpath,@executable_path/../../../../lib/

View File

@@ -126,11 +126,17 @@ INCLUDEPATH *= $$EXTERNALSROOT/$$basename(QMAKESPEC)/include
INCLUDEPATH *= $$EXTERNALSROOT/common/include/crashpad
INCLUDEPATH *= $$EXTERNALSROOT/common/include/mini_chromium
equals(WORD_SIZE,64): EXTERNALSDIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib64
equals(WORD_SIZE,32): EXTERNALSDIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib32
equals(WORD_SIZE,64) {
EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/bin64
EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib64
}
equals(WORD_SIZE,32) {
EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/bin32
EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$basename(QMAKESPEC)/lib32
}
LIBS *= -L$$EXTERNALSDIR
macx: LIBS *= -F$$EXTERNALSDIR
LIBS *= -L$$EXTERNALS_LIB_DIR
macx: LIBS *= -F$$EXTERNALS_LIB_DIR
win32: LIBS *= -luser32
INCLUDEPATH *= $$EXTERNALDIR/common/include