Merge commit '788bc67faa7738cf7c6b2a192ecf3e3567d1c20e' into develop

third_party/libosmium/scripts/travis_install.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+#  travis_install.sh
+#
+
+if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+
+    brew install google-sparsehash || true
+
+    brew install --without-python boost || true
+
+    # workaround for gdal homebrew problem
+    brew remove gdal
+    brew install gdal
+
+fi
+
+cd ..
+git clone --quiet --depth 1 https://github.com/osmcode/osm-testdata.git
+

third_party/libosmium/scripts/travis_script.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+#  travis_script.sh
+#
+
+mkdir build
+cd build
+
+# GCC ignores the pragmas in the code that disable the "return-type" warning
+# selectively, so use this workaround.
+if [ "${CXX}" = "g++" ]; then
+    WORKAROUND="-DCMAKE_CXX_FLAGS=-Wno-return-type"
+else
+    WORKAROUND=""
+fi
+
+if [ "${CXX}" = "g++" ]; then
+    CXX=g++-4.8
+    CC=gcc-4.8
+fi
+
+cmake -LA \
+    -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+    ${WORKAROUND} \
+    ..
+
+make VERBOSE=1
+ctest --output-on-failure
+