Fix output directory in qt projects to be relative to the repository

Conflicts:
	Builds/QtCreator/build_all.sh
This commit is contained in:
Simon Detheridge
2015-07-24 11:09:44 +01:00
parent 3be0a9b469
commit fd5e177df7
8 changed files with 28 additions and 13 deletions

View File

@ -3,6 +3,9 @@
REBUILD=''
NVIDIA=''
NATIVE=''
CONCURRENCY='-j9'
QMAKE=${QMAKE:-qmake}
RELEASE='CONFIG+=release CONFIG-=debug'
while test $# -gt 0
do
@ -13,6 +16,10 @@ do
;;
--native) NATIVE="CONFIG += native"
;;
--travis) CONCURRENCY="-j1"
;;
--debug) RELEASE="CONFIG+=debug CONFIG-=release"
;;
--*) echo "bad option $1"; exit 1
;;
*) echo "unrecognised argument $1"; exit 1
@ -29,8 +36,8 @@ do
if [ "x1" = "x$REBUILD" ]; then
make clean
fi
qmake "$NVIDIA" "$NATIVE"
make -j9
$QMAKE "$NVIDIA" "$NATIVE" $RELEASE
make $CONCURRENCY
if [ "x$?" != "x0" ]; then
echo "Build failed! Check output for errors."
exit 1