Merge pull request #716 from jbcoe/master

Quick fix for failing travis builds on OS X
This commit is contained in:
Phil Nash 2016-10-04 15:57:10 +01:00 committed by GitHub
commit 88732e85b2

View File

@ -148,7 +148,8 @@ install:
mkdir cmake && travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake mkdir cmake && travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
export PATH=${DEPS_DIR}/cmake/bin:${PATH} export PATH=${DEPS_DIR}/cmake/bin:${PATH}
elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
brew install cmake ccache which cmake || brew install cmake
which ccache || brew install ccache
fi fi
before_script: before_script: