And another attempt.

This commit is contained in:
Tadas Baltrusaitis 2017-12-18 13:11:18 +00:00
parent 1a092e3fad
commit 0b50519a7e

View file

@ -26,8 +26,8 @@ before_install:
sudo apt-get install cmake; sudo apt-get install cmake;
sudo apt-get install libboost1.55-all-dev; sudo apt-get install libboost1.55-all-dev;
wget https://github.com/Itseez/opencv/archive/3.1.0.zip; wget https://github.com/Itseez/opencv/archive/3.1.0.zip;
unzip 3.1.0.zip; unzip 3.1.0.zip -q;
opencv-3.1.0; cd opencv-3.1.0;
mkdir build; mkdir build;
cd build; cd build;
fi fi
@ -51,7 +51,8 @@ before_install:
- if [ ${TRAVIS_OS_NAME} = osx ]; then - if [ ${TRAVIS_OS_NAME} = osx ]; then
brew update; brew update;
brew install tbb; brew install tbb;
brew install homebrew/science/opencv || brew link --overwrite homebrew/python/numpy brew install homebrew/science/opencv
homebrew/python/numpy
fi fi
before_script: before_script: