Fixing some travis syntax
This commit is contained in:
parent
d67d232cc2
commit
f69971f6b3
1 changed files with 16 additions and 25 deletions
39
.travis.yml
39
.travis.yml
|
@ -31,31 +31,22 @@ before_install:
|
||||||
- sudo apt-get update -qq
|
- sudo apt-get update -qq
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- if [ "$CXX" == "g++" ]; then
|
- if [ ["$CXX" == "g++"] && [ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install -qq g++-4.8; fi
|
||||||
if [[ ${TRAVIS_OS_NAME} = linux ]]; then
|
- if [ ["$CXX" == "g++"] && [ ${TRAVIS_OS_NAME} = linux ]]; then export CXX="g++-4.8"; fi
|
||||||
sudo apt-get install -qq g++-4.8;
|
- if [ ["$CXX" == "clang++"] && [ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install -qq clang-3.4; fi
|
||||||
export CXX="g++-4.8";
|
- if [ ["$CXX" == "clang++"] && [ ${TRAVIS_OS_NAME} = linux ]]; then export CXX="clang++-3.4"; fi
|
||||||
fi
|
|
||||||
fi
|
|
||||||
- if [ "$CXX" == "clang++" ]; then
|
|
||||||
if [[ ${TRAVIS_OS_NAME} = linux ]]; then
|
|
||||||
sudo apt-get install -qq clang-3.4;
|
|
||||||
export CXX="clang++-3.4";
|
|
||||||
fi
|
|
||||||
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
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${TRAVIS_OS_NAME} = osx ]]; then
|
- if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev; fi
|
||||||
brew update
|
- if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev checkinstall; fi
|
||||||
brew tap homebrew/science
|
|
||||||
brew install tbb boost opencv3
|
# Getting newest boost
|
||||||
fi
|
- if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo add-apt-repository -y ppa:boost-latest/ppa; fi
|
||||||
|
- if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get update; fi
|
||||||
|
- if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install libboost1.55-all-dev; fi
|
||||||
|
|
||||||
|
- if [[ ${TRAVIS_OS_NAME} = osx ]]; then brew update; fi
|
||||||
|
- if [[ ${TRAVIS_OS_NAME} = osx ]]; then brew tap homebrew/science; fi
|
||||||
|
- if [[ ${TRAVIS_OS_NAME} = osx ]]; then brew install tbb boost opencv3; fi
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- git clone https://github.com/Itseez/opencv.git
|
- git clone https://github.com/Itseez/opencv.git
|
||||||
|
|
Loading…
Reference in a new issue