r
/
sustaining_gazes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another small change.

This commit is contained in:
Tadas Baltrusaitis 2016-12-21 10:07:27 -05:00
parent 52ddc921ff
commit 6f78c1b92f
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.travis.yml
View File

@ -14,6 +14,16 @@ os:
- linux - linux
before_install: 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 # g++4.8.1
- if [ "$CXX" = "g++" ]; then - if [ "$CXX" = "g++" ]; then
if [ ${TRAVIS_OS_NAME} = linux ]; then if [ ${TRAVIS_OS_NAME} = linux ]; then
@ -34,24 +44,15 @@ before_install:
fi fi
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 # OpenCV dependencies for osx
- if [ ${TRAVIS_OS_NAME} = osx ]; then - if [ ${TRAVIS_OS_NAME} = osx ]; then
brew update; brew update;
brew tap homebrew/science; brew tap homebrew/science;
/usr/bin/yes | pip uninstall numpy; /usr/bin/yes | pip uninstall numpy;
brew install tbb brew install tbb
fi fi
before_script: before_script:
# Installing openCV 3.1 # Installing openCV 3.1
- wget https://github.com/Itseez/opencv/archive/3.1.0.zip - wget https://github.com/Itseez/opencv/archive/3.1.0.zip
- sudo unzip 3.1.0.zip - sudo unzip 3.1.0.zip