mirror of
https://git.mirrors.martin98.com/https://github.com/google/draco
synced 2025-08-12 18:58:59 +08:00
Merge pull request #374 from google/travis_hackin
Use g++4.9 for Travis GCC builds.
This commit is contained in:
commit
4be770da29
14
.travis.yml
14
.travis.yml
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user