diff --git a/.travis.yml b/.travis.yml index 8c9f66d..5077d35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ compiler: os: - linux + - osx before_install: @@ -24,9 +25,9 @@ before_install: 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 apt-get install libboost1.55-all-dev; - wget https://github.com/Itseez/opencv/archive/3.1.0.zip; - unzip -q 3.1.0.zip; - cd opencv-3.1.0; + wget https://github.com/opencv/opencv/archive/3.4.0.zip; + unzip -q 3.4.0.zip; + cd opencv-3.4.0; mkdir build; cd build; fi @@ -51,13 +52,8 @@ before_install: brew update; brew install tbb; brew tap homebrew/science; - brew install vtk; - wget https://github.com/Itseez/opencv/archive/3.1.0.zip; - unzip -q 3.1.0.zip; - cd opencv-3.1.0; - sudo mkdir build; - cd build; - sudo cmake -D CMAKE_BUILD_TYPE=RELEASE -D WITH_V4L=ON ..; + brew install tbb opencv3; + brew install boost; fi before_script: diff --git a/CMakeLists.txt b/CMakeLists.txt index 385e1c8..ea42e75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ find_package( BLAS REQUIRED ) include_directories( ${BLAS_INCLUDE_DIRS} ) LINK_DIRECTORIES(${BLAS_LIBRARY_DIRS}) -find_package( OpenCV 3.1 REQUIRED ) +find_package( OpenCV 3.3 REQUIRED ) MESSAGE("OpenCV information:") MESSAGE(" OpenCV_INCLUDE_DIRS: ${OpenCV_INCLUDE_DIRS}")