pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed QMAKE detection in build scripts

Browse source
This commit is contained in:
Alex Zolotarev 2012-12-06 20:01:12 -08:00 • committed by Alex Zolotarev
parent 1e37ed3bd9
commit 1485c29aaa
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/autobuild/build.sh
View file

@ -29,14 +29,14 @@ GetCPUCores() {
BuildQt() {
(
# set qmake path
PATH="$(PrintQmakePath):$PATH" || ( echo "ERROR: qmake was not found, please add it to your PATH or into the tools/autobuild/detect_qmake.sh"; exit 1 )
QMAKE="$(PrintQmakePath)" || ( echo "ERROR: qmake was not found, please add it to your PATH or into the tools/autobuild/detect_qmake.sh"; exit 1 )
SHADOW_DIR="$1"
MKSPEC="$2"
QMAKE_PARAMS="$3"
mkdir -p "$SHADOW_DIR"
cd "$SHADOW_DIR"
qmake -r "$QMAKE_PARAMS" -spec "$MKSPEC" "$LOCAL_DIRNAME/../../omim.pro"
"$QMAKE" -r "$QMAKE_PARAMS" -spec "$MKSPEC" "$LOCAL_DIRNAME/../../omim.pro"
# make clean > /dev/null || true
make -j $(GetCPUCores)
)

7
tools/autobuild/detect_qmake.sh
View file

@ -1,7 +1,8 @@
# Add your path into this array
KNOWN_QMAKE_PATHS=( \
~/QtSDK/Desktop/Qt/4.8.1/gcc/bin \
/Developer/QtSDK/Desktop/Qt/4.8.1/gcc/bin \
~/QtSDK/Desktop/Qt/4.8.1/gcc/bin/qmake \
/Developer/QtSDK/Desktop/Qt/4.8.1/gcc/bin/qmake \
~/Developer/Qt-4.8.4/bin/qmake \
)
# Prints path to directory with found qmake binary or prints nothing if not found
@ -12,7 +13,7 @@ PrintQmakePath() {
if [ $? -ne 0 ]; then
# qmake binary is not in the path, look for it in the given array
for path in "${KNOWN_QMAKE_PATHS[@]}"; do
if [ -f "${path}/qmake" ]; then
if [ -f "${path}" ]; then
echo "${path}"
return 0
fi