From abdecc25da1b7bbdce5699f3156dac6d68b41d3c Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Sun, 13 Sep 2015 23:33:16 +0200
Subject: [PATCH] Run with Xcode 7

---
 .travis.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4b221096..102f88df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ os:
   - linux
   - osx
 
+osx_image: xcode7
+
 compiler:
   - clang
   - gcc
@@ -31,12 +33,17 @@ install:
       && wget http://www.cmake.org/files/v${CMAKE_VERSION_MM}/cmake-${CMAKE_VERSION_FULL}-Linux-x86_64.sh
       && sudo sh cmake-${CMAKE_VERSION_FULL}-Linux-x86_64.sh --prefix=/usr/local --exclude-subdir;
     fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install boost cmake; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    brew update
+      && ((brew list -1 | grep -q "^$cmake\$") || brew install cmake)
+      && (brew outdated cmake || brew upgrade cmake)
+      && cmake --version;
+    fi
 
 before_script:
    - mkdir build
    - cd build
-   - if [[ "$CXX" = "g++" && "$CONFIG" = "Debug" ]]; then export CXXFLAGS="--coverage"; fi
+   - if [[ "$CXX" = "g++" && "$CONFIG" = "Debug" && "$TRAVIS_OS_NAME" = "linux" ]]; then export CXXFLAGS="--coverage"; fi
    - cmake .. -DCMAKE_BUILD_TYPE=$CONFIG
 
 script: