From 6f78c1b92fd9318027d3ef2b585a9bc0fc9a6317 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Wed, 21 Dec 2016 10:07:27 -0500 Subject: [PATCH] Another small change. --- .travis.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59b5f5c..38fdf17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,16 @@ os: - linux before_install: + + # OpenCV dependencies and boost + - if [ ${TRAVIS_OS_NAME} = linux ]; then + 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 add-apt-repository -y ppa:boost-latest/ppa; + sudo apt-get update; + sudo apt-get install libboost1.55-all-dev; + fi + # g++4.8.1 - if [ "$CXX" = "g++" ]; then if [ ${TRAVIS_OS_NAME} = linux ]; then @@ -34,24 +44,15 @@ before_install: fi fi - # OpenCV dependencies and boost - - if [ ${TRAVIS_OS_NAME} = linux ]; then - 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 add-apt-repository -y ppa:boost-latest/ppa; - sudo apt-get update; - sudo apt-get install libboost1.55-all-dev; - fi - # OpenCV dependencies for osx - if [ ${TRAVIS_OS_NAME} = osx ]; then brew update; brew tap homebrew/science; /usr/bin/yes | pip uninstall numpy; brew install tbb - fi - -before_script: + fi + +before_script: # Installing openCV 3.1 - wget https://github.com/Itseez/opencv/archive/3.1.0.zip - sudo unzip 3.1.0.zip