divide and conquer

.travis.yml

@@ -8,6 +8,12 @@ matrix:
   include:
     - os: linux
       jdk: oraclejdk7
+      env: 
+        - TARGET=cpp
+        - CXX=g++-5
+    - os: osx
+      compiler: clang
+      osx_image: xcode8.1
       env: TARGET=cpp
     - os: linux
       jdk: oraclejdk7
@@ -34,10 +40,6 @@ matrix:
       compiler: clang
       osx_image: xcode8.1
       env: TARGET=swift
-    - os: osx
-      compiler: clang
-      osx_image: xcode8.1
-      env: TARGET=cpp
 
 before_install:
   - ./.travis/before-install-$TRAVIS_OS_NAME-$TARGET.sh

.travis/before-install-linux-cpp.sh

@@ -6,5 +6,3 @@ sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328
 sudo add-apt-repository ppa:fkrull/deadsnakes -y
 sudo add-apt-repository ppa:rwky/nodejs -y
 sudo apt-get update -qq
-
-export CXX=g++-5

.travis/before-install-osx-cpp.sh

@@ -5,6 +5,7 @@ set -euo pipefail
 thisdir=$(dirname "$0")
 
 brew update
+brew install cmake
 
 # Work around apparent rvm bug that is in Travis's Xcode image.
 # https://github.com/direnv/direnv/issues/210