From fcf9a760295cebe7d07bb5f36cc689421a19f6be Mon Sep 17 00:00:00 2001 From: Denis Blank Date: Mon, 10 Dec 2018 17:37:25 +0100 Subject: [PATCH] Set the minimum required CMake version to 3.11 * Make travis-ci install a recent CMake version * Update function2 --- .travis.yml | 6 ------ CMakeLists.txt | 2 +- dep/function2/function2 | 2 +- tools/travis-ci.sh | 11 +++++++++++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e5b389..c28618c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,6 @@ matrix: packages: - g++-6 - valgrind - - cmake - - cmake-data - ninja-build env: - COMPILER=g++-6 @@ -35,8 +33,6 @@ matrix: - llvm-toolchain-trusty-5.0 packages: - clang-5.0 - - cmake - - cmake-data - ninja-build env: - COMPILER=clang++-5.0 @@ -53,8 +49,6 @@ matrix: - llvm-toolchain-trusty-5.0 packages: - clang-5.0 - - cmake - - cmake-data - ninja-build env: - COMPILER=clang++-5.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2af2843..08fa617 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.11) project(continuable VERSION 3.0.0 LANGUAGES C CXX) if (NOT CTI_CONTINUABLE_IS_FIND_INCLUDED) diff --git a/dep/function2/function2 b/dep/function2/function2 index 5d227e6..5112fc3 160000 --- a/dep/function2/function2 +++ b/dep/function2/function2 @@ -1 +1 @@ -Subproject commit 5d227e6d5abd67bb618bed8b6221574b93a52248 +Subproject commit 5112fc3e8ca3042ebd37fbafbe69ee4cadb8b075 diff --git a/tools/travis-ci.sh b/tools/travis-ci.sh index 111afe2..6a3f4f9 100644 --- a/tools/travis-ci.sh +++ b/tools/travis-ci.sh @@ -1,4 +1,15 @@ #!/bin/bash -e +# Install some dependencies manually +DEPS_DIR="${HOME}/deps" +mkdir -p ${DEPS_DIR} +cd ${DEPS_DIR} + +# Recent CMake: +CMAKE_URL="https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.tar.gz" +mkdir cmake && wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake +export PATH=${DEPS_DIR}/cmake/bin:${PATH} +cmake --version + ############################################################################ # Install libc++ and libc++abi if needed # Taken from here: https://github.com/boostorg/hana/blob/master/.travis.yml