From cb064f1fba8d7d578ffff7266578efadcc562733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 1 Aug 2016 22:55:14 +0200
Subject: [PATCH] package/ci: minor consistency updates.

---
 package/ci/travis-emscripten.sh    | 3 ++-
 package/ci/travis-ios-simulator.sh | 4 ++--
 package/ci/travis.yml              | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/ci/travis-emscripten.sh b/package/ci/travis-emscripten.sh
index bb8d26002..399a03081 100755
--- a/package/ci/travis-emscripten.sh
+++ b/package/ci/travis-emscripten.sh
@@ -3,11 +3,12 @@ set -ev
 
 git submodule update --init
 
+# Corrade
 git clone --depth 1 git://github.com/mosra/corrade.git
 cd corrade
 
 # Build native corrade-rc
-mkdir build && cd build || exit /b
+mkdir build && cd build
 cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps-native \
diff --git a/package/ci/travis-ios-simulator.sh b/package/ci/travis-ios-simulator.sh
index 82efd42b4..fbecd9f01 100755
--- a/package/ci/travis-ios-simulator.sh
+++ b/package/ci/travis-ios-simulator.sh
@@ -10,12 +10,12 @@ cd corrade
 # Build native corrade-rc
 mkdir build && cd build
 cmake .. \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps-native \
     -DCMAKE_INSTALL_RPATH=$HOME/deps-native/lib \
     -DWITH_INTERCONNECT=OFF \
     -DWITH_PLUGINMANAGER=OFF \
-    -DWITH_TESTSUITE=OFF \
-    -DCMAKE_BUILD_TYPE=Release
+    -DWITH_TESTSUITE=OFF
 make -j install
 cd ..
 
diff --git a/package/ci/travis.yml b/package/ci/travis.yml
index 21ffa0d94..c4f9f1ef9 100644
--- a/package/ci/travis.yml
+++ b/package/ci/travis.yml
@@ -59,7 +59,7 @@ install:
 
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX=g++-4.7; fi
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PLATFORM_GL_API=GLX; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then export PLATFORM_GL_API=CGL; fi
+- if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "desktop" ]; then export PLATFORM_GL_API=CGL; fi
 - if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "ios-simulator" ]; then gem install xcpretty; fi
 - if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "emscripten" ]; then brew install emscripten && export LLVM=/usr/local/opt/emscripten/libexec/llvm/bin && emcc; fi
 - if [ "$TARGET" == "desktop" ]; then printf "[General]\ndrivers=null" > ~/.alsoftrc; fi