diff options
| author | Felix Morgner <felix.morgner@gmail.com> | 2020-02-29 13:17:40 +0100 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@gmail.com> | 2020-02-29 13:17:40 +0100 |
| commit | 22f3ea999fbe89fd199fad8227dd96f6b2982844 (patch) | |
| tree | eb26eaa026aeba0c280330e32be4b5d34354dc85 | |
| parent | eee66b517673da38e51b61dc7ed6a4dfdd2a83c9 (diff) | |
| download | newtype-22f3ea999fbe89fd199fad8227dd96f6b2982844.tar.xz newtype-22f3ea999fbe89fd199fad8227dd96f6b2982844.zip | |
ci: install lcov from git
| -rw-r--r-- | .travis.yml | 24 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 |
2 files changed, 16 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index a348464..d148321 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,28 +6,34 @@ dist: bionic addons: apt: sources: - - sourceline: "ppa:ubuntu-toolchain-r/test" + - sourceline: 'ppa:ubuntu-toolchain-r/test' + - sourceline: 'deb https://apt.kitware.com/ubuntu/ bionic main' + key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc' packages: - g++-9 - - lcov + - cmake compiler: - gcc -env: - - CXX=g++-9 - cache: directories: - $HOME/.conan/data +before_install: + - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 20 + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 20 + - sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-9 20 + - sudo update-alternatives --config gcc + - sudo update-alternatives --config g++ + - sudo update-alternatives --config gcov + install: - pip install conan - conan user - - wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add - - - sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' - - sudo apt-get update - - sudo apt-get install cmake + - git clone git://github.com/linux-test-project/lcov.git + - cd lcov && sudo make install + - cd .. script: - /usr/bin/cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=YES -DRUN_TESTS_AFTER_BUILD=YES -DENABLE_CODE_COVERAGE=YES -DPRINT_COVERAGE_REPORT=YES diff --git a/CMakeLists.txt b/CMakeLists.txt index fdd2fa3..951ad62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,7 @@ if(BUILD_TESTING) conan_check(REQUIRED) conan_add_remote(NAME "fmorgner-public" URL "https://api.bintray.com/conan/fmorgner/conan-public") conan_cmake_run(CONANFILE "conanfile.py" + OUTPUT_QUIET BASIC_SETUP CMAKE_TARGETS BUILD "missing" |