From d67d232cc246be77e5fb2a3052b9bfe484351df5 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Fri, 29 Jul 2016 10:31:29 -0400 Subject: [PATCH] Next attempt at osx with travis --- .travis.yml | 53 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 691f301..de2a6e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,33 +15,56 @@ os: before_install: # g++4.8.1 - - if [ "$CXX" == "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi + - if [ "$CXX" == "g++" ]; then + if [[ ${TRAVIS_OS_NAME} = linux ]]; then + sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; + fi + fi # clang 3.4 - - if [ "$CXX" == "clang++" ]; then sudo add-apt-repository -y ppa:h-rayflood/llvm; fi + - if [ "$CXX" == "clang++" ]; then + if [[ ${TRAVIS_OS_NAME} = linux ]]; then + sudo add-apt-repository -y ppa:h-rayflood/llvm; + fi + fi - sudo apt-get update -qq install: - - if [ "$CXX" == "g++" ]; then sudo apt-get install -qq g++-4.8; fi - - if [ "$CXX" == "g++" ]; then export CXX="g++-4.8"; fi - - if [ "$CXX" == "clang++" ]; then sudo apt-get install -qq clang-3.4; fi - - if [ "$CXX" == "clang++" ]; then 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 + - 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 + before_script: - git clone https://github.com/Itseez/opencv.git - cd opencv - mkdir build - cd build - cmake .. - - make -j4 - - sudo make -j4 install + - make -j2 + - sudo make -j2 install - cd ../.. script: @@ -49,5 +72,5 @@ script: - mkdir build - cd build - cmake -D CMAKE_BUILD_TYPE=RELEASE .. - - make + - make -j2 - ./bin/FaceLandmarkImg -fdir "../videos/" -ofdir "./demo_img/" -oidir "./demo_img/" -wild -q \ No newline at end of file