no message
This commit is contained in:
parent
53119f0bca
commit
a48d36e1ae
1 changed files with 14 additions and 17 deletions
31
.travis.yml
31
.travis.yml
|
@ -18,6 +18,8 @@ before_install:
|
|||
- if [ "$CXX" = "g++" ]; then
|
||||
if [[ ${TRAVIS_OS_NAME} = linux ]]; then
|
||||
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
|
||||
sudo apt-get install -qq g++-4.8;
|
||||
export CXX="g++-4.8";
|
||||
fi
|
||||
fi
|
||||
|
||||
|
@ -25,6 +27,8 @@ before_install:
|
|||
- if [ "$CXX" = "clang++" ]; then
|
||||
if [[ ${TRAVIS_OS_NAME} = linux ]]; then
|
||||
sudo add-apt-repository -y ppa:h-rayflood/llvm;
|
||||
sudo apt-get install -qq clang-3.4;
|
||||
export CXX="clang++-3.4";
|
||||
fi
|
||||
fi
|
||||
|
||||
|
@ -33,24 +37,17 @@ before_install:
|
|||
install:
|
||||
|
||||
- 'if [ ${TRAVIS_OS_NAME} = linux ]; then
|
||||
if [ "$CXX" = "g++" ]; then
|
||||
sudo apt-get install -qq g++-4.8;
|
||||
export CXX="g++-4.8";
|
||||
else
|
||||
sudo apt-get install -qq clang-3.4;
|
||||
export CXX="clang++-3.4";
|
||||
fi;
|
||||
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;
|
||||
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
|
||||
brew update;
|
||||
brew tap homebrew/science;
|
||||
/usr/bin/yes | pip uninstall numpy;
|
||||
brew install tbb
|
||||
brew update;
|
||||
brew tap homebrew/science;
|
||||
/usr/bin/yes | pip uninstall numpy;
|
||||
brew install tbb
|
||||
fi'
|
||||
|
||||
# Installing openCV 3.1
|
||||
|
|
Loading…
Reference in a new issue