diff options
| author | Jack Lloyd <[email protected]> | 2016-08-25 14:26:34 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-08-25 14:26:34 -0400 |
| commit | 1354eabeb65a38f933dda42b16f7645a77b4972d (patch) | |
| tree | 8a7902e9e57355d049fd5550e551c416464a49e2 /src/scripts/ci/travis/install.sh | |
| parent | 949ff42b3bb0ff4751b414aad5fcbe90d8d26d99 (diff) | |
| parent | 7d37534d81819f5328336b489bee1d68cb4a129b (diff) | |
Merge GH #603 Use ccache on OS X Travis CI build
Diffstat (limited to 'src/scripts/ci/travis/install.sh')
| -rwxr-xr-x | src/scripts/ci/travis/install.sh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/scripts/ci/travis/install.sh b/src/scripts/ci/travis/install.sh index 387ccef6c..a9d38ed80 100755 --- a/src/scripts/ci/travis/install.sh +++ b/src/scripts/ci/travis/install.sh @@ -18,14 +18,19 @@ if [ "$BUILD_MODE" = "sonarqube" ]; then unzip build-wrapper-linux-x86.zip fi -if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$TARGETOS" != "ios" ]; then +if [ "$TRAVIS_OS_NAME" = "osx" ]; then # Workaround for https://github.com/Homebrew/homebrew/issues/42553 brew update || brew update - brew install xz - brew install python # python2 - brew install python3 + brew install ccache + + if [ "$TARGETOS" = "native" ]; then + brew install xz + brew install python # python2 + brew install python3 + + # Boost 1.58 is installed on Travis OS X images + # brew install boost + fi - # Boost 1.58 is installed on Travis OS X images - # brew install boost fi |