caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

travis: hopefully fix use of gcc-4.9

Browse Source
This commit is contained in:
Hugues Delorme 2016-01-13 17:21:15 +01:00
parent 50db64cdb7
commit 6c87a92a42
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -22,7 +22,7 @@ matrix:
# Linux GCC-4.9 release static # Linux GCC-4.9 release static
- compiler: gcc-4.9 - compiler: gcc-4.9
addons: *gcc49-packages addons: *gcc49-packages
env: CC=/usr/bin/gcc-4.9 CXX=/usr/bin/g++-4.9 TRAVIS_BUILD_TYPE=Release TRAVIS_SHARED_LIBS=OFF TRAVIS_STRICT_C90=OFF TRAVIS_MAKE_CHECK=ON TRAVIS_COVERALLS=OFF env: TRAVIS_BUILD_TYPE=Release TRAVIS_SHARED_LIBS=OFF TRAVIS_STRICT_C90=OFF TRAVIS_MAKE_CHECK=ON TRAVIS_COVERALLS=OFF TRAVIS_GCC_VERSION=4.9
# OSX Clang debug static # OSX Clang debug static
- os: osx - os: osx
compiler: clang compiler: clang

6
travis-build-script.sh
View File

@ -18,6 +18,12 @@ echo TRAVIS_COVERALLS=$TRAVIS_COVERALLS
# CMake # CMake
mkdir build && cd build mkdir build && cd build
cmake --version cmake --version
if [ -n "${TRAVIS_GCC_VERSION}" ]; then
export CC=gcc-4.9;
export CXX=g++-4.9;
fi
cmake .. -G "Unix Makefiles" \ cmake .. -G "Unix Makefiles" \
-DCMAKE_DEBUG_POSTFIX=_d \ -DCMAKE_DEBUG_POSTFIX=_d \
-DCMAKE_BUILD_TYPE=$TRAVIS_BUILD_TYPE \ -DCMAKE_BUILD_TYPE=$TRAVIS_BUILD_TYPE \