diff --git a/.travis.yml b/.travis.yml index c72ba62..0594e68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,27 +16,28 @@ before_install: # OpenCV dependencies and boost - 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; - sudo apt-get install cmake - sudo add-apt-repository -y ppa:boost-latest/ppa; - sudo apt-get update; - sudo apt-get install libboost1.55-all-dev; + apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev; + 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 cmake + #sudo add-apt-repository -y ppa:boost-latest/ppa; + apt-get update; + apt-get install libboost1.55-all-dev; 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; + unzip 3.1.0.zip; + opencv-3.1.0; + mkdir build; + build; fi # g++4.8.1 - if [ "$CXX" = "g++" ]; then if [ ${TRAVIS_OS_NAME} = linux ]; then - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; - sudo apt-get update -qq; - sudo apt-get install -qq g++-4.8; - export CXX="g++-4.8"; - 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 ..; + #sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; + #sudo apt-get update -qq; + #sudo apt-get install -qq g++-4.8; + #export CXX="g++-4.8"; + $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 ..; fi fi @@ -44,8 +45,8 @@ before_install: - if [ "$CXX" = "clang++" ]; then if [ ${TRAVIS_OS_NAME} = linux ]; then $CXX --version; - sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers; - 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 ..; + #sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers; + 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 @@ -61,8 +62,8 @@ before_install: fi before_script: - - sudo make -j4 - - sudo make install + - make -j4 + - make install - cd ../.. script: