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

Some restructure

Browse source
This commit is contained in:
Tadas Baltrusaitis 2016-12-21 09:53:08 -05:00
parent b6401a196d
commit 55b4dfd928
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.travis.yml
View file

@ -16,7 +16,7 @@ os:
before_install: before_install:
# g++4.8.1 # g++4.8.1
- if [ "$CXX" = "g++" ]; then - if [ "$CXX" = "g++" ]; then
if [ ${TRAVIS_OS_NAME} = linux ]; then if [[ ${TRAVIS_OS_NAME} = linux ]]; then
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
sudo apt-get update -qq; sudo apt-get update -qq;
sudo apt-get install -qq g++-4.8; sudo apt-get install -qq g++-4.8;
@ -26,16 +26,17 @@ before_install:
# clang 3.4 # clang 3.4
- if [ "$CXX" = "clang++" ]; then - if [ "$CXX" = "clang++" ]; then
if [ ${TRAVIS_OS_NAME} = linux ]; then if [[ ${TRAVIS_OS_NAME} = linux ]]; then
sudo add-apt-repository -y ppa:h-rayflood/llvm; sudo add-apt-repository -y ppa:h-rayflood/llvm;
sudo apt-get update -qq; sudo apt-get update -qq;
sudo apt-get install -qq clang-3.4; sudo apt-get install -qq clang-3.4;
export CXX="clang++-3.4"; export CXX="clang++-3.4";
fi fi
fi fi
install:
# Dependencies for OpenCV 3.1 - 'if [ ${TRAVIS_OS_NAME} = linux ]; then
- 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 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; 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
@ -47,8 +48,8 @@ before_install:
brew tap homebrew/science; brew tap homebrew/science;
/usr/bin/yes | pip uninstall numpy; /usr/bin/yes | pip uninstall numpy;
brew install tbb brew install tbb
fi fi'
before_script: before_script:
# Installing openCV 3.1 # Installing openCV 3.1
- wget https://github.com/Itseez/opencv/archive/3.1.0.zip - wget https://github.com/Itseez/opencv/archive/3.1.0.zip
@ -56,7 +57,6 @@ before_script:
- cd opencv-3.1.0 - cd opencv-3.1.0
- sudo mkdir build - sudo mkdir build
- cd build - cd build
- $CXX --version
- if [ "$CXX" = "g++" ]; then 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 - if [ "$CXX" = "g++" ]; then 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
- if [ "$CXX" = "clang++" ]; then sudo cmake -D CMAKE_CXX_COMPILER=clang++ -D CMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++ -I/usr/include/libcxxabi" -D CMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++ -lc++abi" -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 - if [ "$CXX" = "clang++" ]; then sudo cmake -D CMAKE_CXX_COMPILER=clang++ -D CMAKE_CXX_FLAGS="-std=c++11 -stdlib=libc++ -I/usr/include/libcxxabi" -D CMAKE_EXE_LINKER_FLAGS="-std=c++11 -stdlib=libc++ -lc++abi" -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
- sudo make -j4 - sudo make -j4
@ -65,7 +65,6 @@ before_script:
script: script:
- $CXX --version - $CXX --version
- echo $CXX
- mkdir build - mkdir build
- cd build - cd build
- cmake -D CMAKE_BUILD_TYPE=RELEASE .. - cmake -D CMAKE_BUILD_TYPE=RELEASE ..