From 004b1972d2024f8ad20255b217458acc3a283dd5 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Fri, 29 Jul 2016 11:43:58 -0400 Subject: [PATCH] Some more fixes for osx and g++ --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa29f85..8bf4d12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,10 +31,10 @@ before_install: - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get update -qq; fi 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 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 export CXX="clang++-3.4"; 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" == "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 [[ ${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 @@ -46,7 +46,7 @@ install: - 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 + - if [[ ${TRAVIS_OS_NAME} = osx ]]; then brew install tbb opencv3; fi before_script: - git clone https://github.com/Itseez/opencv.git