diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-11-13 00:30:40 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-11-13 00:30:40 +0100 |
| commit | 21490a42bdc7a205aa67b9d7c4bd292735f1b153 (patch) | |
| tree | f6b8e6e9dfc5c6e1318621b2acb81fadafb70ea9 /travis | |
| parent | d855f4905d52f64453e31e0bd2ac66b57c423ad9 (diff) | |
| download | MultiMC-21490a42bdc7a205aa67b9d7c4bd292735f1b153.tar MultiMC-21490a42bdc7a205aa67b9d7c4bd292735f1b153.tar.gz MultiMC-21490a42bdc7a205aa67b9d7c4bd292735f1b153.tar.lz MultiMC-21490a42bdc7a205aa67b9d7c4bd292735f1b153.tar.xz MultiMC-21490a42bdc7a205aa67b9d7c4bd292735f1b153.zip | |
Revert "NOISSUE travis: use a ppa for cmake 3.2.3"
This reverts commit d855f4905d52f64453e31e0bd2ac66b57c423ad9.
Diffstat (limited to 'travis')
| -rw-r--r-- | travis/prepare.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/travis/prepare.sh b/travis/prepare.sh index 4909f4db..1916f2d7 100644 --- a/travis/prepare.sh +++ b/travis/prepare.sh @@ -8,12 +8,14 @@ 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 apt-get install cmake + + 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/ export CMAKE_PREFIX_PATH=/opt/$QT_PKG_PREFIX/lib/cmake export PATH=/opt/cmake-3/bin:/opt/$QT_PKG_PREFIX/bin:$PATH |