From d62cd462c34bf6fc0bd51f8207333c04d2f26ba1 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Wed, 21 Dec 2016 11:51:36 -0500 Subject: [PATCH] Moving more things to before install --- .travis.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f1a306..78c419a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,13 +43,19 @@ before_install: export CXX="clang++-3.4"; fi fi - -before_script: + + - if [ ${TRAVIS_OS_NAME} = osx ]; then + brew update; + brew tap homebrew/science; + fi + - 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 + +before_script: - 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