r/sustaining_gazes
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some more fixes for osx and g++

Browse source
This commit is contained in:
Tadas Baltrusaitis 2016-07-29 11:43:58 -04:00
parent a87509a2d5
commit 004b1972d2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

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