From a48d36e1ae9bf604eb9342ecdae28abc40c1221f Mon Sep 17 00:00:00 2001
From: Tadas Baltrusaitis <tadyla@gmail.com>
Date: Tue, 20 Dec 2016 17:54:54 -0500
Subject: [PATCH] no message

---
 .travis.yml | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0759472..2146188 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,8 @@ before_install:
   - if [ "$CXX" = "g++" ]; then
       if [[ ${TRAVIS_OS_NAME} = linux ]]; then
         sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; 
+        sudo apt-get install -qq g++-4.8; 
+        export CXX="g++-4.8";		
       fi 
     fi
 
@@ -25,6 +27,8 @@ before_install:
   - if [ "$CXX" = "clang++" ]; then
       if [[ ${TRAVIS_OS_NAME} = linux ]]; then  
         sudo add-apt-repository -y ppa:h-rayflood/llvm;
+        sudo apt-get install -qq clang-3.4;
+        export CXX="clang++-3.4";
       fi
     fi
 
@@ -33,24 +37,17 @@ before_install:
 install:
 
   - 'if [ ${TRAVIS_OS_NAME} = linux ]; then
-        if [ "$CXX" = "g++" ]; then 
-            sudo apt-get install -qq g++-4.8; 
-            export CXX="g++-4.8";
-        else
-            sudo apt-get install -qq clang-3.4;
-            export CXX="clang++-3.4";
-        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
-        sudo add-apt-repository -y ppa:boost-latest/ppa;
-        sudo apt-get update;
-        sudo apt-get install libboost1.55-all-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;
+      # Getting newest boost
+      sudo add-apt-repository -y ppa:boost-latest/ppa;
+      sudo apt-get update;
+      sudo apt-get install libboost1.55-all-dev;
     else
-        brew update;
-        brew tap homebrew/science;
-        /usr/bin/yes | pip uninstall numpy;
-        brew install tbb
+      brew update;
+      brew tap homebrew/science;
+      /usr/bin/yes | pip uninstall numpy;
+      brew install tbb
     fi'
       
   # Installing openCV 3.1