From 2243dbf0d119e3be23e1bec661910d11be34331f Mon Sep 17 00:00:00 2001
From: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
Date: Tue, 12 Jun 2018 22:02:07 -0400
Subject: [PATCH] Travis commit #2

---
 .travis.yml        | 8 ++++----
 build-deps-unix.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ef0aaa9..396ce2c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ matrix:
           packages:
             - ninja-build
       env:
-        - MATRIX_EVAL="Coverage='On' && CXX='g++-7' && TYPE='Debug'"
+        - MATRIX_EVAL="Coverage='On' && CXX='g++' && TYPE='Debug'"
       install:
         - eval "${MATRIX_EVAL}"
         - pip install --user cpp-coveralls
@@ -31,7 +31,7 @@ matrix:
           packages:
             - ninja-build
       env:
-        - MATRIX_EVAL="LINKER='LD' && CXX=g++-7 && TYPE='RelWithDebInfo'"
+        - MATRIX_EVAL="LINKER='LD' && CXX=g++ && TYPE='RelWithDebInfo'"
       install:
         - eval "${MATRIX_EVAL}"
         - bash ./tools/travis/linux_deps.sh
@@ -47,7 +47,7 @@ matrix:
           packages:
             - ninja-build
       env:
-        - MATRIX_EVAL="LINKER='LD' && CXX=g++-7 && TYPE='Release'"
+        - MATRIX_EVAL="LINKER='LD' && CXX=g++ && TYPE='Release'"
       install:
         - eval "${MATRIX_EVAL}"
         - bash ./tools/travis/linux_deps.sh
@@ -117,7 +117,7 @@ matrix:
       install:
         - brew update
         - HOMEBREW_NO_AUTO_UPDATE=1 brew upgrade cmake
-        - HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja
+        - HOMEBREW_NO_AUTO_UPDATE=1 brew install ninja ossp-uuid
         - bash ./build-deps-unix.sh
         - mkdir -p build
         - cd build && cmake .. -DCMAKE_BUILD_TYPE=Release -DOPENBVE2_ON_TRAVIS=True -GNinja
diff --git a/build-deps-unix.sh b/build-deps-unix.sh
index 1afee5a..19df028 100644
--- a/build-deps-unix.sh
+++ b/build-deps-unix.sh
@@ -29,7 +29,7 @@ wget -c -nc https://dl.bintray.com/boostorg/release/1.64.0/source/boost_1_64_0.t
 # # Build Boost.... 
 tar xjf dependencies/binary/downloads/boost_1_64_0.tar.bz2 -C dependencies/binary/src/boost
 cd dependencies/binary/src/boost/boost_1_64_0/
-echo "using gcc : 7.0 : `type -p g++-7` ; " > tools/build/src/user-config.jam
+echo "using gcc : 7 : `type -p g++-7` ; " > tools/build/src/user-config.jam
 ./bootstrap.sh --prefix=$basedir/dependencies/binary/build_x64 --with-libraries=filesystem,system,regex
 ./b2 link=$linking threading=multi variant=release runtime-link=shared install -j$(($(nproc) + 1)) -d0
 cd "${0%/*}"