diff options
| author | davidebeatrici <davidebeatrici@gmail.com> | 2018-02-18 22:18:34 +0300 |
|---|---|---|
| committer | davidebeatrici <davidebeatrici@gmail.com> | 2018-02-19 01:56:34 +0300 |
| commit | 2396580e509f32b5e3c98dd9167b306cfdb2d0c6 (patch) | |
| tree | 77f1c462a50bbc851f32af9505ac9c8d7ff0c9a7 /src | |
| parent | 209255df67098860c04af1f357262f1fc932d8dc (diff) | |
src: set custom build directory in relation to the global one
Diffstat (limited to 'src')
| -rw-r--r-- | src/mumble.pri | 7 | ||||
| -rw-r--r-- | src/mumble_exe/mumble_exe.pro | 2 | ||||
| -rw-r--r-- | src/mumble_proto/mumble_proto.pro | 8 | ||||
| -rw-r--r-- | src/murmur/murmur_grpc/murmur_grpc.pro | 8 | ||||
| -rw-r--r-- | src/murmur/murmur_ice/murmur_ice.pro | 8 | ||||
| -rw-r--r-- | src/tests/test.pri | 2 |
6 files changed, 3 insertions, 32 deletions
diff --git a/src/mumble.pri b/src/mumble.pri index 683bcf8d5..52e1801ff 100644 --- a/src/mumble.pri +++ b/src/mumble.pri @@ -139,11 +139,6 @@ isEqual(QT_MAJOR_VERSION, 4) { CONFIG(debug, debug|release) { CONFIG += console - QMAKE_LIBDIR = ../../debug $$QMAKE_LIBDIR - DESTDIR = ../../debug } -CONFIG(release, debug|release) { - QMAKE_LIBDIR = ../../release $$QMAKE_LIBDIR - DESTDIR = ../../release -} +QMAKE_LIBDIR = $$DESTDIR $$QMAKE_LIBDIR diff --git a/src/mumble_exe/mumble_exe.pro b/src/mumble_exe/mumble_exe.pro index 4894167ef..58588ed04 100644 --- a/src/mumble_exe/mumble_exe.pro +++ b/src/mumble_exe/mumble_exe.pro @@ -47,12 +47,10 @@ win32-msvc* { CONFIG(debug, debug|release) { CONFIG += console DEFINES *= DEBUG - DESTDIR = ../../debug } CONFIG(release, debug|release) { DEFINES *= NDEBUG - DESTDIR = ../../release } include(../../qmake/symbols.pri) diff --git a/src/mumble_proto/mumble_proto.pro b/src/mumble_proto/mumble_proto.pro index 42c2c164f..b325f68bd 100644 --- a/src/mumble_proto/mumble_proto.pro +++ b/src/mumble_proto/mumble_proto.pro @@ -38,12 +38,4 @@ QMAKE_EXTRA_COMPILERS *= pb pbh CONFIG += warn_off } -CONFIG(debug, debug|release) { - DESTDIR = ../../debug -} - -CONFIG(release, debug|release) { - DESTDIR = ../../release -} - include(../../qmake/symbols.pri) diff --git a/src/murmur/murmur_grpc/murmur_grpc.pro b/src/murmur/murmur_grpc/murmur_grpc.pro index 986722e83..067a3f794 100644 --- a/src/murmur/murmur_grpc/murmur_grpc.pro +++ b/src/murmur/murmur_grpc/murmur_grpc.pro @@ -52,12 +52,4 @@ unix { QMAKE_CXXFLAGS *= -std=c++11 } -CONFIG(debug, debug|release) { - DESTDIR = ../../../debug -} - -CONFIG(release, debug|release) { - DESTDIR = ../../../release -} - include(../../../qmake/symbols.pri) diff --git a/src/murmur/murmur_ice/murmur_ice.pro b/src/murmur/murmur_ice/murmur_ice.pro index 6683f4d99..5664b1a3e 100644 --- a/src/murmur/murmur_ice/murmur_ice.pro +++ b/src/murmur/murmur_ice/murmur_ice.pro @@ -73,12 +73,4 @@ macx:CONFIG(static) { CONFIG += warn_off } -CONFIG(debug, debug|release) { - DESTDIR = ../../../debug -} - -CONFIG(release, debug|release) { - DESTDIR = ../../../release -} - include(../../../qmake/symbols.pri) diff --git a/src/tests/test.pri b/src/tests/test.pri index 653d31515..1224bb560 100644 --- a/src/tests/test.pri +++ b/src/tests/test.pri @@ -35,3 +35,5 @@ HEADERS += PlatformCheck.h # include OpenSSL, and if the headers aren't # in the include path, the build will break. include(../../qmake/openssl.pri) + +DESTDIR = $$DESTDIR/tests |