Compare commits

...

2 Commits

Author SHA1 Message Date
Jesse Beder
33bdf167e0 Update build to 0.7.0. 2021-07-10 10:49:09 -05:00
Jesse Beder
b43575f89c Update travis config to use updated versions of OS and compilers.
This fixes the linux/gcc error building Google Test with gcc 4.7:

https://travis-ci.org/github/jbeder/yaml-cpp/jobs/668233706
2020-04-07 22:27:32 -05:00
2 changed files with 27 additions and 20 deletions

View File

@@ -1,21 +1,16 @@
language: c++ language: c++
os:
- linux matrix:
- osx include:
compiler: - os: linux
- clang compiler: gcc
- gcc - os: osx
before_install: compiler: clang
- | - os: osx
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then compiler: gcc
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y \
&& sudo apt-get update -qq \
&& if [ "$CXX" == "g++" ]; then
sudo apt-get install -qq g++-4.7 && export CXX="g++-4.7" CC="gcc-4.7"
fi
fi
env: env:
- CTEST_OUTPUT_ON_FAILURE=1 - CTEST_OUTPUT_ON_FAILURE=1
before_script: before_script:
- mkdir build - mkdir build
- cd build - cd build
@@ -24,7 +19,19 @@ before_script:
script: script:
- cmake --build build - cmake --build build
- cmake --build build --target test - cmake --build build --target test
matrix:
exclude: addons:
- os: linux apt:
compiler: clang sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.9
packages:
- g++-4.9
- clang-3.9
update: true
homebrew:
packages:
- ccache
- gcc@4.9
- llvm@4
update: true

View File

@@ -1,6 +1,6 @@
# 3.5 is actually available almost everywhere, but this a good minimum # 3.5 is actually available almost everywhere, but this a good minimum
cmake_minimum_required(VERSION 3.4) cmake_minimum_required(VERSION 3.4)
project(YAML_CPP VERSION 0.6.3 LANGUAGES CXX) project(YAML_CPP VERSION 0.7.0 LANGUAGES CXX)
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
include(CMakeDependentOption) include(CMakeDependentOption)