From 179c3296e64667e40652e06e342fde6c2a51bd88 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Wed, 21 Dec 2016 12:07:15 -0500 Subject: [PATCH] no message --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78c419a..91ed8be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,19 +43,20 @@ before_install: export CXX="clang++-3.4"; fi fi - - - if [ ${TRAVIS_OS_NAME} = osx ]; then + + - if ["{TRAVIS_OS_NAME}}" = osx]; then brew update; brew tap homebrew/science; + /usr/bin/yes | pip uninstall numpy; + brew install tbb fi - - wget https://github.com/Itseez/opencv/archive/3.1.0.zip - - sudo unzip 3.1.0.zip + - wget https://github.com/Itseez/opencv/archive/3.1.0.zip + - sudo unzip 3.1.0.zip +before_script: - 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