From d855f4905d52f64453e31e0bd2ac66b57c423ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 13 Nov 2015 00:24:07 +0100 Subject: [PATCH] NOISSUE travis: use a ppa for cmake 3.2.3 --- travis/prepare.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/travis/prepare.sh b/travis/prepare.sh index 1916f2d7b..4909f4dbd 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