From 1e0081699bb7e35f93c35e4651fb2d47fba56917 Mon Sep 17 00:00:00 2001 From: Artyom Dymchenko Date: Mon, 11 Jan 2016 21:39:42 +0600 Subject: [PATCH] travis and CMake 2.8.8 installation test; --- .travis.yml | 14 ++++++++++++-- contrib/cmake/CMakeLists.txt | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2f6b1564..b9ceed8ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,9 @@ language: c -compiler: gcc -script: make $ZSTD_TRAVIS_CI_ENV + 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" - sudo apt-get update -qq - sudo apt-get install -qq gcc-arm-linux-gnueabi - sudo apt-get install -qq clang @@ -9,6 +11,9 @@ before_install: - sudo apt-get install -qq gcc-multilib - 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" + env: - ZSTD_TRAVIS_CI_ENV=travis-install - ZSTD_TRAVIS_CI_ENV=cmaketest @@ -22,6 +27,11 @@ env: - ZSTD_TRAVIS_CI_ENV=asan - ZSTD_TRAVIS_CI_ENV=asan32 - ZSTD_TRAVIS_CI_ENV="-C programs valgrindTest" + +compiler: gcc + +script: + - make $ZSTD_TRAVIS_CI_ENV matrix: fast_finish: true diff --git a/contrib/cmake/CMakeLists.txt b/contrib/cmake/CMakeLists.txt index 5cb8cc097..0eb07816e 100644 --- a/contrib/cmake/CMakeLists.txt +++ b/contrib/cmake/CMakeLists.txt @@ -32,7 +32,7 @@ # ################################################################ PROJECT(zstd) -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7) +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) OPTION(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF) -- 2.47.2