Next attempt at osx with travis

This commit is contained in:
Tadas Baltrusaitis 2016-07-29 10:31:29 -04:00
parent 5a71c68e20
commit d67d232cc2

View file

@ -15,24 +15,47 @@ os:
before_install: before_install:
# g++4.8.1 # 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 # 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 - sudo apt-get update -qq
install: install:
- if [ "$CXX" == "g++" ]; then sudo apt-get install -qq g++-4.8; fi - if [ "$CXX" == "g++" ]; then
- if [ "$CXX" == "g++" ]; then export CXX="g++-4.8"; fi if [[ ${TRAVIS_OS_NAME} = linux ]]; then
- if [ "$CXX" == "clang++" ]; then sudo apt-get install -qq clang-3.4; fi sudo apt-get install -qq g++-4.8;
- if [ "$CXX" == "clang++" ]; then export CXX="clang++-3.4"; fi export CXX="g++-4.8";
- sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev fi
- 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 [ "$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 # Getting newest boost
- sudo add-apt-repository -y ppa:boost-latest/ppa sudo add-apt-repository -y ppa:boost-latest/ppa
- sudo apt-get update sudo apt-get update
- sudo apt-get install libboost1.55-all-dev 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: before_script:
- git clone https://github.com/Itseez/opencv.git - git clone https://github.com/Itseez/opencv.git
@ -40,8 +63,8 @@ before_script:
- mkdir build - mkdir build
- cd build - cd build
- cmake .. - cmake ..
- make -j4 - make -j2
- sudo make -j4 install - sudo make -j2 install
- cd ../.. - cd ../..
script: script:
@ -49,5 +72,5 @@ script:
- mkdir build - mkdir build
- cd build - cd build
- cmake -D CMAKE_BUILD_TYPE=RELEASE .. - cmake -D CMAKE_BUILD_TYPE=RELEASE ..
- make - make -j2
- ./bin/FaceLandmarkImg -fdir "../videos/" -ofdir "./demo_img/" -oidir "./demo_img/" -wild -q - ./bin/FaceLandmarkImg -fdir "../videos/" -ofdir "./demo_img/" -oidir "./demo_img/" -wild -q