Merge pull request #374 from google/travis_hackin

Use g++4.9 for Travis GCC builds.
This commit is contained in:
tomfinegan 2018-04-24 09:46:27 -07:00 committed by GitHub
commit 4be770da29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8,6 +8,14 @@ matrix:
- os: linux - os: linux
dist: trusty dist: trusty
compiler: gcc compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.9
env:
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
- os: osx - os: osx
osx_image: xcode8.3 osx_image: xcode8.3
compiler: clang compiler: clang
@ -19,11 +27,13 @@ addons:
packages: packages:
- ccache - ccache
- cmake - cmake
- g++-4.9
before_install: before_install:
- if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew update; fi - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew update; fi
- if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew install ccache; fi - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew install ccache; fi
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]] && [[ "${CXX}" = "g++" ]]; then
export CXX="g++-4.9" CC="gcc-4.9";
fi
script: script:
# Output version info for compilers, cmake, and make # Output version info for compilers, cmake, and make
@ -36,5 +46,5 @@ script:
# Configure and build # Configure and build
- mkdir _travis_build && cd _travis_build - mkdir _travis_build && cd _travis_build
- cmake -G "Unix Makefiles" -DENABLE_TESTS=ON -DENABLE_CCACHE=ON .. - cmake -G "Unix Makefiles" -DENABLE_TESTS=ON -DENABLE_CCACHE=ON ..
- make -j - make -j10
- ./draco_tests - ./draco_tests