diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2017-05-29 13:46:30 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-05-30 08:26:12 +0000 |
commit | 1a4456c233b73ab08f7003b0196a30ae408b5c86 (patch) | |
tree | cead665513d9a10ea0bd81c0ef9fddca8c502459 /src | |
parent | 356819a15b2b1de24b3893f7eb4eba6f2a84db09 (diff) |
Make "bin" the libexec path on Windows
Otherwise, our binary distributions will not work out of the box, as the
process launcher is not in the same place as the libraries.
Change-Id: Ied375fa48e5c2cb037d3cb2108296126ee3be4cc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/app/qbs/qbs.pro | 5 | ||||
-rw-r--r-- | src/lib/corelib/corelib.pro | 5 | ||||
-rw-r--r-- | src/libexec/libexec.pri | 7 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/app/qbs/qbs.pro b/src/app/qbs/qbs.pro index f2c3023b6..ac9d6f0ca 100644 --- a/src/app/qbs/qbs.pro +++ b/src/app/qbs/qbs.pro @@ -20,7 +20,10 @@ HEADERS += \ qbstool.h include(../../library_dirname.pri) -isEmpty(QBS_RELATIVE_LIBEXEC_PATH):QBS_RELATIVE_LIBEXEC_PATH=../libexec/qbs +isEmpty(QBS_RELATIVE_LIBEXEC_PATH) { + win32:QBS_RELATIVE_LIBEXEC_PATH=. + else:QBS_RELATIVE_LIBEXEC_PATH=../libexec/qbs +} isEmpty(QBS_RELATIVE_PLUGINS_PATH):QBS_RELATIVE_PLUGINS_PATH=../$${QBS_LIBRARY_DIRNAME} isEmpty(QBS_RELATIVE_SEARCH_PATH):QBS_RELATIVE_SEARCH_PATH=.. DEFINES += QBS_RELATIVE_LIBEXEC_PATH=\\\"$${QBS_RELATIVE_LIBEXEC_PATH}\\\" diff --git a/src/lib/corelib/corelib.pro b/src/lib/corelib/corelib.pro index 0ca361850..97093e319 100644 --- a/src/lib/corelib/corelib.pro +++ b/src/lib/corelib/corelib.pro @@ -1,7 +1,10 @@ TARGET = qbscore include(../library.pri) -isEmpty(QBS_RELATIVE_LIBEXEC_PATH):QBS_RELATIVE_LIBEXEC_PATH=../libexec/qbs +isEmpty(QBS_RELATIVE_LIBEXEC_PATH) { + win32:QBS_RELATIVE_LIBEXEC_PATH=../bin + else:QBS_RELATIVE_LIBEXEC_PATH=../libexec/qbs +} DEFINES += QBS_RELATIVE_LIBEXEC_PATH=\\\"$${QBS_RELATIVE_LIBEXEC_PATH}\\\" QT += core-private network script diff --git a/src/libexec/libexec.pri b/src/libexec/libexec.pri index 5eeb7b9db..a5cd2c599 100644 --- a/src/libexec/libexec.pri +++ b/src/libexec/libexec.pri @@ -1,8 +1,11 @@ include(../install_prefix.pri) +win32:LIBEXEC_BASE_DIR=bin +else:LIBEXEC_BASE_DIR=libexec/qbs + !isEmpty(QBS_LIBEXEC_DESTDIR):DESTDIR=$${QBS_LIBEXEC_DESTDIR} -else:DESTDIR = ../../../libexec/qbs +else:DESTDIR=../../../$$LIBEXEC_BASE_DIR !isEmpty(QBS_LIBEXEC_INSTALL_DIR):target.path = $${QBS_LIBEXEC_INSTALL_DIR} -else:target.path = $${QBS_INSTALL_PREFIX}/libexec/qbs +else:target.path = $${QBS_INSTALL_PREFIX}/$$LIBEXEC_BASE_DIR INSTALLS += target |