Skip to content

Commit

Permalink
Forgot to save the file.
Browse files Browse the repository at this point in the history
  • Loading branch information
TadasBaltrusaitis committed Dec 21, 2016
1 parent 55b4dfd commit 52ddc92
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ os:
before_install:
# g++4.8.1
- 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 apt-get update -qq;
sudo apt-get install -qq g++-4.8;
Expand All @@ -26,29 +26,30 @@ before_install:

# clang 3.4
- 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 apt-get update -qq;
sudo apt-get install -qq clang-3.4;
export CXX="clang++-3.4";
fi
fi

install:

- 'if [ ${TRAVIS_OS_NAME} = linux ]; then
sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev;
# 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;
# 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
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'
fi

before_script:
# Installing openCV 3.1
Expand Down

0 comments on commit 52ddc92

Please sign in to comment.