From d7e25b12d4d5843118d49b9a003be0ff7d754266 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Tue, 20 Dec 2016 14:44:37 -0500 Subject: [PATCH] no message --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9fd6774..9d5a68c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,16 +48,15 @@ install: - if [[ ${TRAVIS_OS_NAME} = osx ]]; then brew tap homebrew/science; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then /usr/bin/yes | pip uninstall numpy; fi - if [[ ${TRAVIS_OS_NAME} = osx ]]; then brew install tbb opencv3; fi - -before_script: - # OpenCV install for linux + + # Installing openCV 3.1 - wget https://github.com/Itseez/opencv/archive/3.1.0.zip - sudo unzip 3.1.0.zip - cd opencv-3.1.0 - sudo mkdir build - cd build - - 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" = "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 - sudo make -j4 - sudo make install - sudo ldconfig