Yet another attempt at g++
This commit is contained in:
parent
2a2696268a
commit
63c787540f
1 changed files with 6 additions and 2 deletions
|
@ -6,7 +6,6 @@ branches:
|
||||||
- develop
|
- develop
|
||||||
- feature-travis
|
- feature-travis
|
||||||
compiler:
|
compiler:
|
||||||
- clang
|
|
||||||
- gcc
|
- gcc
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
|
@ -14,13 +13,18 @@ before_install:
|
||||||
- if [ "$CXX" == "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
|
- if [ "$CXX" == "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
|
||||||
|
|
||||||
# clang 3.4
|
# clang 3.4
|
||||||
- if [ "$CXX" == "clang++" ]; then sudo add-apt-repository -y ppa:h-rayflood/llvm; fi
|
#- if [ "$CXX" == "clang++" ]; then sudo add-apt-repository -y ppa:h-rayflood/llvm; fi
|
||||||
|
|
||||||
- sudo apt-get update -qq
|
- sudo apt-get update -qq
|
||||||
|
|
||||||
install:
|
install:
|
||||||
|
- if [ "$CXX" == "g++" ]; then sudo apt-get install -qq g++-4.8; fi
|
||||||
|
- if [ "$CXX" == "g++" ]; then export CXX="g++-4.8"; fi
|
||||||
- sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev
|
- sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev
|
||||||
- sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev checkinstall
|
- sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev checkinstall
|
||||||
|
# Getting newest boost
|
||||||
|
#- add-apt-repository ppa:boost-latest/ppa
|
||||||
|
#- sudo apt-get update
|
||||||
- sudo apt-get install libboost-all-dev
|
- sudo apt-get install libboost-all-dev
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
|
|
Loading…
Reference in a new issue