From 9877f95fe2045b2339d7ea2f39fd6a1d1451e089 Mon Sep 17 00:00:00 2001 From: Bogdan Vaneev Date: Fri, 24 May 2019 11:09:48 +0300 Subject: [PATCH] Add ccache, add travis cache Signed-off-by: Bogdan Vaneev --- .travis.yml | 11 ++++++++++- CMakeLists.txt | 3 +++ dep/asio/asio | 2 +- tools/travis-ci.sh | 10 ++++++---- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7bd1768..0fb3f7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,13 @@ sudo: true dist: trusty language: cpp -cache: apt +cache: + apt: true + ccache: true + directories: + - ${HOME}/install + - ${HOME}/deps + - dep git: depth: 1 @@ -18,6 +24,7 @@ matrix: - g++-6 - valgrind - ninja-build + - ccache env: - COMPILER=g++-6 - BUILD_CONFIG=Debug @@ -35,6 +42,7 @@ matrix: packages: - clang-5.0 - ninja-build + - ccache env: - COMPILER=clang++-5.0 - BUILD_CONFIG=Release @@ -52,6 +60,7 @@ matrix: packages: - clang-5.0 - ninja-build + - ccache env: - COMPILER=clang++-5.0 - BUILD_CONFIG=Debug diff --git a/CMakeLists.txt b/CMakeLists.txt index ad8c30c..8ffea00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,9 @@ # SOFTWARE. cmake_minimum_required(VERSION 3.11) + + + project(continuable VERSION 3.0.0 LANGUAGES C CXX) if (CTI_CONTINUABLE_IS_FIND_INCLUDED) diff --git a/dep/asio/asio b/dep/asio/asio index 90f3266..230c0d2 160000 --- a/dep/asio/asio +++ b/dep/asio/asio @@ -1 +1 @@ -Subproject commit 90f32660cd503494b3707840cfbd5434d8e9dabe +Subproject commit 230c0d2ae035c5ce1292233fcab03cea0d341264 diff --git a/tools/travis-ci.sh b/tools/travis-ci.sh index aedd740..d1570c1 100644 --- a/tools/travis-ci.sh +++ b/tools/travis-ci.sh @@ -4,6 +4,8 @@ DEPS_DIR="${HOME}/deps" mkdir -p ${DEPS_DIR} cd ${DEPS_DIR} +INSTALL_DIR="${HOME}/install" + # 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 @@ -33,14 +35,14 @@ if [[ "${CXX%%+*}" == "clang" ]]; then wget -O - ${LLVM_URL} | tar --strip-components=1 -xJ -C llvm wget -O - ${LIBCXX_URL} | tar --strip-components=1 -xJ -C llvm/projects/libcxx wget -O - ${LIBCXXABI_URL} | tar --strip-components=1 -xJ -C llvm/projects/libcxxabi - (cd llvm/build && cmake .. -DCMAKE_INSTALL_PREFIX=${TRAVIS_BUILD_DIR}/llvm/install) + (cd llvm/build && cmake .. -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}) (cd llvm/build/projects/libcxx && make install -j2) (cd llvm/build/projects/libcxxabi && make install -j2) fi - export STD_CXX_FLAGS="-isystem ${TRAVIS_BUILD_DIR}/llvm/install/include/c++/v1 -stdlib=libc++" - export STD_LINKER_FLAGS="-L ${TRAVIS_BUILD_DIR}/llvm/install/lib -l c++ -l c++abi" - export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${TRAVIS_BUILD_DIR}/llvm/install/lib" + export STD_CXX_FLAGS="-isystem ${INSTALL_DIR}/include/c++/v1 -stdlib=libc++" + export STD_LINKER_FLAGS="-L ${INSTALL_DIR}/lib -l c++ -l c++abi" + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${INSTALL_DIR}/lib" fi # Function for creating a new 'build' directory