From 63c787540f61821d0e3f730db06074684f1accbc Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Wed, 27 Jul 2016 16:07:46 -0400 Subject: [PATCH] Yet another attempt at g++ --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4dda21b..1b30935 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ branches: - develop - feature-travis compiler: - - clang - gcc before_install: @@ -14,13 +13,18 @@ before_install: - if [ "$CXX" == "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi # 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 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 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 before_script: