diff --git a/.travis.yml b/.travis.yml index 14ac3942..a7fd849b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,13 +13,21 @@ matrix: compiler: clang addons: apt: + sources: + # Both needed for clang 3.7 + - llvm-toolchain-precise-3.7 + - ubuntu-toolchain-r-test packages: + - clang-3.7 - libcrypto++-dev - libfuse-dev install: +# Use new clang +- if [ "${TRAVIS_OS_NAME}" == "linux" ] && [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi # Detect number of CPU cores - export NUMCORES=`grep -c ^processor /proc/cpuinfo` && if [ ! -n "$NUMCORES" ]; then export NUMCORES=`sysctl -n hw.ncpu`; fi - echo Using $NUMCORES cores +# Install dependencies - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then ./travis.install_boost.sh; fi - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then brew upgrade boost && brew install cryptopp osxfuse; fi # Install run_with_fuse.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 3bd6c67d..36be034c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8 FATAL_ERROR) include(utils.cmake) require_gcc_version(4.8) -require_clang_version(3.5) # clang 3.5 needed for spdlog dependency +require_clang_version(3.7) # Default value is not to build test cases if(NOT BUILD_TESTING)