From da84e602bc5e07d26b689db7f26992b46bbd691e Mon Sep 17 00:00:00 2001 From: Holger Nahrstaedt Date: Wed, 9 Mar 2016 17:08:04 +0100 Subject: [PATCH] new fix --- .travis.yml | 64 +++++++++++++++++++++++++++++++++----------------- CMakeLists.txt | 2 +- 2 files changed, 43 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6cc6655..42aa94f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,32 +1,52 @@ - +sudo: false language: cpp - os: - - linux - - osx - -compiler: - - gcc - - clang - + - linux + - osx +cache: + directories: + - compiler/.cabal-sandbox + - cs/packages env: - - BUILD_CONFIG=Release - - BUILD_CONFIG=Debug - + - LANG=cpp-clang + - LANG=cpp-gcc +addons: + apt: + sources: + - boost-latest + - ubuntu-toolchain-r-test + packages: + - g++-4.8 + - libboost1.55-all-dev matrix: - allow_failures: - - compiler: clang + exclude: + # linux VM is too small to build C++ unit tests with g++ + - os: linux + env: LANG=cpp-gcc + # linux C++ build/test already includes Python + - os: linux + env: LANG=cpp-clang + - os: osx + env: LANG=cpp-gcc + - os: osx + env: LANG=cpp-clang before_install: - - sudo apt-get update -qq - - sudo apt-get install -qq libboost-system-dev libboost-thread-dev libboost-test-dev libtinyxml-dev -install: + # select C++ compiler + - export CXX="clang++" CC="clang" + - if [[ $LANG == *gcc ]]; then export CXX="g++-4.8" CC="gcc-4.8"; fi + # linux prereqisite packages + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget --no-check-certificate https://www.cmake.org/files/v3.2/cmake-3.2.3-Linux-x86_64.tar.gz; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then tar -xzvf cmake-3.2.3-Linux-x86_64.tar.gz; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH=$PWD/cmake-3.2.3-Linux-x86_64/bin:$PATH; fi + # OS X prerequisite packages + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi before_script: - - mkdir build.ci - - cd build.ci - - cmake .. -DBUILD_UT=ON -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DUSE_STATIC_BOOST=YES + script: - - cmake --build . - - ctest -VV + - mkdir build.ci && cd build.ci + - cmake .. -DBUILD_UT=ON -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DUSE_STATIC_BOOST=YES + - cmake --build . + - ctest -VV diff --git a/CMakeLists.txt b/CMakeLists.txt index e825a5f..095ec64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR) +cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR) set(PROJECT_NAME wavelib) project(${PROJECT_NAME} CXX C)