diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-11-13 00:24:07 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-11-13 00:24:07 +0100 |
| commit | d855f4905d52f64453e31e0bd2ac66b57c423ad9 (patch) | |
| tree | 6cbeda05f2820c8fda57ab5e02efca426159a017 /travis | |
| parent | 12c7b11fe6c20f13f03f40360b705a41b161976d (diff) | |
| download | MultiMC-d855f4905d52f64453e31e0bd2ac66b57c423ad9.tar MultiMC-d855f4905d52f64453e31e0bd2ac66b57c423ad9.tar.gz MultiMC-d855f4905d52f64453e31e0bd2ac66b57c423ad9.tar.lz MultiMC-d855f4905d52f64453e31e0bd2ac66b57c423ad9.tar.xz MultiMC-d855f4905d52f64453e31e0bd2ac66b57c423ad9.zip | |
NOISSUE travis: use a ppa for cmake 3.2.3
Diffstat (limited to 'travis')
| -rw-r--r-- | travis/prepare.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/travis/prepare.sh b/travis/prepare.sh index 1916f2d7..4909f4db 100644 --- a/travis/prepare.sh +++ b/travis/prepare.sh @@ -8,14 +8,12 @@ then echo $QT_PKG_PREFIX sudo add-apt-repository -y ppa:beineri/opt-${QT_WITHOUT_DOTS} sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test # for a recent GCC + sudo add-apt-repository -y ppa:george-edison55/precise-backports # for cmake sudo add-apt-repository "deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main" sudo apt-get update -qq sudo apt-get install ${QT_PKG_PREFIX}base ${QT_PKG_PREFIX}svg ${QT_PKG_PREFIX}tools ${QT_PKG_PREFIX}x11extras ${QT_PKG_PREFIX}webkit - - sudo mkdir -p /opt/cmake-3/ - wget http://www.cmake.org/files/v3.2/cmake-3.2.2-Linux-x86_64.sh - sudo sh cmake-3.2.2-Linux-x86_64.sh --skip-license --prefix=/opt/cmake-3/ + sudo apt-get install cmake export CMAKE_PREFIX_PATH=/opt/$QT_PKG_PREFIX/lib/cmake export PATH=/opt/cmake-3/bin:/opt/$QT_PKG_PREFIX/bin:$PATH |