From 40af0683280673fe52674d35e2378172a6473f0c Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sun, 21 Feb 2016 17:19:55 +1300 Subject: [PATCH] Build: Make mingw build scripts paths independent of wdir --- cmake/build_mingw32.sh | 4 ++-- cmake/build_mingw64.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/build_mingw32.sh b/cmake/build_mingw32.sh index 455da6fc5..8d36c94b5 100755 --- a/cmake/build_mingw32.sh +++ b/cmake/build_mingw32.sh @@ -16,5 +16,5 @@ if [ "$1" = "-qt5" ] ; then CMAKE_OPTS="-DWANT_QT5=ON -DCMAKE_PREFIX_PATH=$MINGW $CMAKE_OPTS" fi -cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win32Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/ $CMAKE_OPTS - +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +cmake $DIR/.. -DCMAKE_TOOLCHAIN_FILE=$DIR/../cmake/modules/Win32Toolchain.cmake -DCMAKE_MODULE_PATH=$DIR/../cmake/modules/ $CMAKE_OPTS diff --git a/cmake/build_mingw64.sh b/cmake/build_mingw64.sh index d5f393d24..211b629c0 100755 --- a/cmake/build_mingw64.sh +++ b/cmake/build_mingw64.sh @@ -14,5 +14,5 @@ if [ "$1" = "-qt5" ] ; then CMAKE_OPTS="-DWANT_QT5=ON -DCMAKE_PREFIX_PATH=$MINGW $CMAKE_OPTS" fi -cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win64Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/ $CMAKE_OPTS - +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +cmake $DIR/.. -DCMAKE_TOOLCHAIN_FILE=$DIR/../cmake/modules/Win64Toolchain.cmake -DCMAKE_MODULE_PATH=$DIR/../cmake/modules/ $CMAKE_OPTS