Forgot to save the file.

This commit is contained in:
Tadas Baltrusaitis 2016-12-21 09:58:15 -05:00
parent 55b4dfd928
commit 52ddc921ff

View file

@ -16,7 +16,7 @@ os:
before_install: before_install:
# 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
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
sudo apt-get update -qq; sudo apt-get update -qq;
sudo apt-get install -qq g++-4.8; sudo apt-get install -qq g++-4.8;
@ -26,29 +26,30 @@ before_install:
# clang 3.4 # clang 3.4
- if [ "$CXX" = "clang++" ]; then - if [ "$CXX" = "clang++" ]; then
if [[ ${TRAVIS_OS_NAME} = linux ]]; then if [ ${TRAVIS_OS_NAME} = linux ]; then
sudo add-apt-repository -y ppa:h-rayflood/llvm; sudo add-apt-repository -y ppa:h-rayflood/llvm;
sudo apt-get update -qq; sudo apt-get update -qq;
sudo apt-get install -qq clang-3.4; sudo apt-get install -qq clang-3.4;
export CXX="clang++-3.4"; export CXX="clang++-3.4";
fi fi
fi fi
install:
- 'if [ ${TRAVIS_OS_NAME} = linux ]; then # OpenCV dependencies and boost
sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev; - 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 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 add-apt-repository -y ppa:boost-latest/ppa;
sudo apt-get update; sudo apt-get update;
sudo apt-get install libboost1.55-all-dev; sudo apt-get install libboost1.55-all-dev;
else fi
# OpenCV dependencies for osx
- 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