diff options
| author |  Sam Spilsbury | 2016-04-25 09:40:12 +0800 |
|---|---|---|
| committer | Sam Spilsbury | 2016-04-25 10:18:40 +0800 |
| commit | 599dc2bbb5e7325b9baa8d55ef17915dd283173d (patch) | |
| tree | e691188c0807876d339546e14e41cb916ed24c0e | |
| parent | shader: Shader size is long uint, not uint. (diff) | |
| download | yuzu-599dc2bbb5e7325b9baa8d55ef17915dd283173d.tar.gz yuzu-599dc2bbb5e7325b9baa8d55ef17915dd283173d.tar.xz yuzu-599dc2bbb5e7325b9baa8d55ef17915dd283173d.zip | |
travis: Install cmake 3.1
| -rwxr-xr-x | .travis-deps.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh index c7bb7e785..4a79feb70 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh | |||
| @@ -9,7 +9,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then | |||
| 9 | export CXX=g++-5 | 9 | export CXX=g++-5 |
| 10 | mkdir -p $HOME/.local | 10 | mkdir -p $HOME/.local |
| 11 | 11 | ||
| 12 | curl -L http://www.cmake.org/files/v2.8/cmake-2.8.11-Linux-i386.tar.gz \ | 12 | curl -L http://www.cmake.org/files/v3.1/cmake-3.1.0-Linux-i386.tar.gz \ |
| 13 | | tar -xz -C $HOME/.local --strip-components=1 | 13 | | tar -xz -C $HOME/.local --strip-components=1 |
| 14 | 14 | ||
| 15 | ( | 15 | ( |
| @@ -20,6 +20,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then | |||
| 20 | ) | 20 | ) |
| 21 | elif [ "$TRAVIS_OS_NAME" = "osx" ]; then | 21 | elif [ "$TRAVIS_OS_NAME" = "osx" ]; then |
| 22 | brew update > /dev/null # silence the very verbose output | 22 | brew update > /dev/null # silence the very verbose output |
| 23 | brew install qt5 sdl2 dylibbundler | 23 | brew unlink cmake |
| 24 | brew install cmake31 qt5 sdl2 dylibbundler | ||
| 24 | gem install xcpretty | 25 | gem install xcpretty |
| 25 | fi | 26 | fi |