From d230f08a2c3ffd5cf136195fe71cffd7fff595d1 Mon Sep 17 00:00:00 2001 From: Axel Isouard Date: Sat, 26 Nov 2016 12:37:25 +0100 Subject: [PATCH] CMake: Force version 3.5 --- .travis.yml | 14 +++++++++++++- CMakeLists.txt | 2 +- Targets/libwebrtc/CMakeLists.txt | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e91b9b7..1c629fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,21 @@ addons: - libasound2-dev - libpulse-dev - libudev-dev - - cmake install: +- DEPS_DIR="${TRAVIS_BUILD_DIR}/deps" +- mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR} +- | + if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then + CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.tar.gz" + mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake + export PATH=${DEPS_DIR}/cmake/bin:${PATH} + else + if ! brew ls --version cmake &>/dev/null; then brew install cmake; fi + fi +- cd ${TRAVIS_BUILD_DIR} +- cmake --version + - git submodule init - git submodule update - mkdir out diff --git a/CMakeLists.txt b/CMakeLists.txt index a092e77..187c1d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.5) project(libwebrtc) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} diff --git a/Targets/libwebrtc/CMakeLists.txt b/Targets/libwebrtc/CMakeLists.txt index 9b25021..5eefdbd 100644 --- a/Targets/libwebrtc/CMakeLists.txt +++ b/Targets/libwebrtc/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.5) project(libwebrtc) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}