From 9960e473eb74c1855af942a41248f71e73359089 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Tue, 20 Dec 2016 14:00:01 -0500 Subject: [PATCH] Realizing the issue with grabbing openCV 3.2 rather than 3.1 --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 806d068..6e487ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,10 +36,8 @@ install: - if [ "$CXX" = "clang++" ]; then if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install -qq clang-3.4; fi fi - if [ "$CXX" = "clang++" ]; then if [[ ${TRAVIS_OS_NAME} = linux ]]; then export CXX="clang++-3.4"; fi fi - - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get -qq remove ffmpeg x264 libx264-dev; fi - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev; fi - - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev checkinstall; fi - - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install libv4l-dev libxvidcore-dev libx264-dev; fi + - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo apt-get install python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libdc1394-22-dev checkinstall; fi # Getting newest boost - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo add-apt-repository -y ppa:boost-latest/ppa; fi @@ -53,8 +51,9 @@ install: before_script: # OpenCV install for linux - - git clone https://github.com/Itseez/opencv.git - - cd opencv + - wget https://github.com/Itseez/opencv/archive/3.1.0.zip + - sudo unzip 3.1.0.zip + - cd opencv-3.1.0 - mkdir build - cd build - 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 ..