aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaios <naios-dev@live.de>2016-03-13 18:41:30 +0100
committerNaios <naios-dev@live.de>2016-03-17 15:33:43 +0100
commit87bc353b3446fb95e141d44fe49da3e5059f7436 (patch)
tree38246b6cea8ba6772cf095e128f44a1f75a8006d
parent5e74c2223bff8a467d6f1ce18f6f08aa05e17019 (diff)
Travis: Upgrade CMake to version 3.2
* Since we require at least version 3.0 now
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 23c378a1169..7ed50ef0ec4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,13 +6,13 @@ git:
depth: 1
before_install:
- - echo "yes" | sudo add-apt-repository ppa:kalakris/cmake
+ - echo "yes" | sudo add-apt-repository ppa:george-edison55/precise-backports
- echo "yes" | sudo add-apt-repository ppa:boost-latest/ppa
- echo "yes" | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
- echo "yes" | sudo add-apt-repository 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.5 main'
- wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
- sudo apt-get -qq update
- - sudo apt-get -qq install build-essential libtool gcc-4.8 g++-4.8 make cmake openssl clang-3.5
+ - sudo apt-get -qq install build-essential libtool gcc-4.8 g++-4.8 make cmake cmake-data openssl clang-3.5
- sudo apt-get -qq install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev
- sudo apt-get -qq install libboost1.55-dev libboost-thread1.55-dev libboost-filesystem1.55-dev libboost-system1.55-dev libboost-program-options1.55-dev libboost-iostreams1.55-dev
- export CC=clang-3.5 CXX=clang++-3.5