From fe636912db87e4aa9b155ad61a041222deef8f4f Mon Sep 17 00:00:00 2001
From: Pierre GRANDIN <pgrandin@users.noreply.github.com>
Date: Wed, 20 Jan 2016 13:12:22 -0800
Subject: Enable USE_GOOGLEPLACES when building for Linux

---
 ci/build_linux.sh | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index 4f90d5d98..6a36d603b 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -1,21 +1,22 @@
+OPTS="-Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n -DUSE_GOOGLEPLACES:BOOL=TRUE"
 if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trunk" ]]; then
-	tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz
-	export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH
-	
-	mkdir bin && cd bin
-	cov-build --dir cov-int cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n
-	cov-build --dir cov-int make || exit -1
-	tar czvf navit.tgz cov-int
-	
-	curl --form token=$COVERITY_TOKEN \
+        tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz
+        export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH
+
+        mkdir bin && cd bin
+        cov-build --dir cov-int cmake ${OPTS} ../
+        cov-build --dir cov-int make || exit -1
+        tar czvf navit.tgz cov-int
+
+        curl --form token=$COVERITY_TOKEN \
   --form email=$COVERITY_EMAIL \
   --form file=@navit.tgz \
   --form version="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \
   --form description="${CIRCLE_BRANCH}-$CIRCLE_SHA1" \
   https://scan.coverity.com/builds?project=$CIRCLE_PROJECT_USERNAME
 else
-	mkdir bin && cd bin
-	cmake ../ -Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n|| exit -1
-	make  || exit -1
+        mkdir bin && cd bin
+        cmake ${OPTS} ../
+        make  || exit -1
 fi
 cp -r navit/xpm $CIRCLE_ARTIFACTS
-- 
cgit v1.2.1