Merge branch 'develop' of https://github.com/TadasBaltrusaitis/OpenFace into develop
This commit is contained in:
commit
1a092e3fad
1 changed files with 14 additions and 10 deletions
24
.travis.yml
24
.travis.yml
|
@ -1,5 +1,8 @@
|
||||||
language: cpp
|
language: cpp
|
||||||
|
|
||||||
|
dist: trusty
|
||||||
|
sudo: required
|
||||||
|
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
|
@ -16,11 +19,12 @@ before_install:
|
||||||
|
|
||||||
# OpenCV dependencies and boost
|
# OpenCV dependencies and boost
|
||||||
- if [ ${TRAVIS_OS_NAME} = linux ]; then
|
- if [ ${TRAVIS_OS_NAME} = linux ]; then
|
||||||
apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev;
|
sudo apt-get update;
|
||||||
apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev checkinstall;
|
sudo apt-get install libopenblas-dev;
|
||||||
apt-get install cmake;
|
sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev;
|
||||||
apt-get update;
|
sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev checkinstall;
|
||||||
apt-get install libboost1.55-all-dev;
|
sudo apt-get install cmake;
|
||||||
|
sudo apt-get install libboost1.55-all-dev;
|
||||||
wget https://github.com/Itseez/opencv/archive/3.1.0.zip;
|
wget https://github.com/Itseez/opencv/archive/3.1.0.zip;
|
||||||
unzip 3.1.0.zip;
|
unzip 3.1.0.zip;
|
||||||
opencv-3.1.0;
|
opencv-3.1.0;
|
||||||
|
@ -32,7 +36,7 @@ before_install:
|
||||||
- if [ "$CXX" = "g++" ]; then
|
- if [ "$CXX" = "g++" ]; then
|
||||||
if [ ${TRAVIS_OS_NAME} = linux ]; then
|
if [ ${TRAVIS_OS_NAME} = linux ]; then
|
||||||
$CXX --version;
|
$CXX --version;
|
||||||
cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON -D WITH_OPENCL=OFF -D INSTALL_C_EXAMPLES=OFF -D BUILD_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF ..;
|
sudo cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON -D WITH_OPENCL=OFF -D INSTALL_C_EXAMPLES=OFF -D BUILD_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF ..;
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -40,19 +44,19 @@ before_install:
|
||||||
- if [ "$CXX" = "clang++" ]; then
|
- if [ "$CXX" = "clang++" ]; then
|
||||||
if [ ${TRAVIS_OS_NAME} = linux ]; then
|
if [ ${TRAVIS_OS_NAME} = linux ]; then
|
||||||
$CXX --version;
|
$CXX --version;
|
||||||
cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON -D WITH_OPENCL=OFF -D INSTALL_C_EXAMPLES=OFF -D BUILD_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D WITH_TBB=ON ..;
|
sudo cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON -D WITH_OPENCL=OFF -D INSTALL_C_EXAMPLES=OFF -D BUILD_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D WITH_TBB=ON ..;
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- if [ ${TRAVIS_OS_NAME} = osx ]; then
|
- if [ ${TRAVIS_OS_NAME} = osx ]; then
|
||||||
brew update;
|
brew update;
|
||||||
brew install tbb;
|
brew install tbb;
|
||||||
brew install opencv3 --HEAD;
|
brew install homebrew/science/opencv || brew link --overwrite homebrew/python/numpy
|
||||||
fi
|
fi
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- make -j4
|
- sudo make -j4
|
||||||
- make install
|
- sudo make install
|
||||||
- cd ../..
|
- cd ../..
|
||||||
|
|
||||||
script:
|
script:
|
||||||
|
|
Loading…
Reference in a new issue