Fixing some travis syntax

This commit is contained in:
Tadas Baltrusaitis 2016-07-29 10:40:51 -04:00
parent d67d232cc2
commit f69971f6b3

View file

@ -31,32 +31,23 @@ before_install:
- sudo apt-get update -qq
install:
- if [ "$CXX" == "g++" ]; then
if [[ ${TRAVIS_OS_NAME} = linux ]]; then
sudo apt-get install -qq g++-4.8;
export CXX="g++-4.8";
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
brew update
brew tap homebrew/science
brew install tbb boost opencv3
fi
- if [ ["$CXX" == "g++"] && [ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install -qq g++-4.8; fi
- if [ ["$CXX" == "g++"] && [ ${TRAVIS_OS_NAME} = linux ]]; then export CXX="g++-4.8"; fi
- if [ ["$CXX" == "clang++"] && [ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install -qq clang-3.4; fi
- if [ ["$CXX" == "clang++"] && [ ${TRAVIS_OS_NAME} = linux ]]; then 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; fi
- 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
# Getting newest boost
- 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:
- git clone https://github.com/Itseez/opencv.git
- cd opencv