Skip to content
Snippets Groups Projects
Commit 227d6754 authored by Lars Bilke's avatar Lars Bilke Committed by Lars Bilke
Browse files

[Travis] gcc 4.9

parent 5ceb1f7a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
.travis.yml
+ 2
− 2
View file @ 227d6754
...@@ -8,7 +8,7 @@ addons: ...@@ -8,7 +8,7 @@ addons:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- g++-4.8 - g++-4.9
- qtbase5-dev - qtbase5-dev
- libqt5xmlpatterns5-dev - libqt5xmlpatterns5-dev
- libxt-dev - libxt-dev
...@@ -50,7 +50,7 @@ before_install: ...@@ -50,7 +50,7 @@ before_install:
before_script: before_script:
- export PATH=$HOME/cmake-3.1.1-Linux-x86_64/bin:$PATH - export PATH=$HOME/cmake-3.1.1-Linux-x86_64/bin:$PATH
- if [ "$CC" == "gcc" ]; then export CXX=g++-4.8 CC=gcc-4.8; fi - if [ "$CC" == "gcc" ]; then export CXX=g++-4.9 CC=gcc-4.9; fi
script: script:
- if [ "$CASE" == "CHECK" ]; then git config core.whitespace -blank-at-eof; git diff --check `git merge-base origin/master HEAD` HEAD; fi - if [ "$CASE" == "CHECK" ]; then git config core.whitespace -blank-at-eof; git diff --check `git merge-base origin/master HEAD` HEAD; fi
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment