From a207930d3086ee533f67a7395119cc0729ea8dfa Mon Sep 17 00:00:00 2001 From: Artyom Dymchenko Date: Mon, 11 Jan 2016 23:03:55 +0600 Subject: [PATCH] CMake 2.8.11 with travis test; --- .travis.yml | 11 +++++++---- contrib/cmake/CMakeLists.txt | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b9ceed8ed..b7afffb11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,8 @@ language: c before_install: - - "wget https://launchpad.net/ubuntu/+source/cmake/2.8.8-2ubuntu1/+build/3441442/+files/cmake_2.8.8-2ubuntu1_amd64.deb" - - "wget https://launchpad.net/ubuntu/+archive/primary/+files/cmake-data_2.8.8-2ubuntu1_all.deb" - - "sudo apt-get remove cmake-data cmake" + - "wget -q http://cardinot.net/files/cmake-2.8.11.tar.gz" + - "tar -xzvf cmake-2.8.11.tar.gz" - sudo apt-get update -qq - sudo apt-get install -qq gcc-arm-linux-gnueabi - sudo apt-get install -qq clang @@ -12,7 +11,11 @@ before_install: - sudo apt-get install -qq valgrind install: - - "sudo dpkg --install cmake-data_2.8.8-2ubuntu1_all.deb cmake_2.8.8-2ubuntu1_amd64.deb" + - "cd cmake-2.8.11" + - "./bootstrap --prefix=/usr --system-libs --mandir=/share/man" + - "make -j 16" + - "sudo make install -j 16" + - "cd .." env: - ZSTD_TRAVIS_CI_ENV=travis-install diff --git a/contrib/cmake/CMakeLists.txt b/contrib/cmake/CMakeLists.txt index 0eb07816e..4732490ce 100644 --- a/contrib/cmake/CMakeLists.txt +++ b/contrib/cmake/CMakeLists.txt @@ -32,7 +32,7 @@ # ################################################################ PROJECT(zstd) -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11) OPTION(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF) -- 2.47.3