diff --git a/.ci/install-libcsptr.sh b/.ci/install-libcsptr.sh index 2826ec7..0e98b2c 100755 --- a/.ci/install-libcsptr.sh +++ b/.ci/install-libcsptr.sh @@ -7,14 +7,8 @@ git clone --branch ${tag} --depth 1 ${repo} dependencies/libcsptr && ( cd dependencies/libcsptr && ./autogen.sh && - ./configure "$@" && + ./configure --prefix=$HOME && make && - { - if command -v sudo; then - sudo make install - else - make install - fi - } + make install ) rm -Rf dependencies diff --git a/.travis.yml b/.travis.yml index 20a0717..f8eb968 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,25 @@ language: c compiler: - gcc +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - check + - gcc-4.9 + - gettext + - cmake before_install: - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - - sudo apt-get -qq update - - sudo apt-get -qq install -y check gcc-4.9 gettext cmake - - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 90 - - sudo pip install cpp-coveralls - - .ci/install-libcsptr.sh --prefix=/usr + - pip install --user cpp-coveralls + - .ci/install-libcsptr.sh + - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/lib + - export LIBRARY_PATH=$LIBRARY_PATH:$HOME/lib script: - - mkdir -p build && cd $_ && cmake .. && make && make -C samples test + - mkdir -p build && cd $_ + - cmake .. + - make + - make -C samples test after_success: - coveralls --gcov gcov-4.9 --exclude samples --exclude dependencies --gcov-options '\-lp' -b . after_failure: diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e2d919..d4aca14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.2.2) +cmake_minimum_required(VERSION 2.8) cmake_policy(SET CMP0048 NEW) project(Criterion VERSION 1.2.2) diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 42aee2d..ead99be 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.1) project(criterion_samples) set(CMAKE_C_FLAGS "-std=c99 -Wall -Wextra -pedantic")