From b9e6f531417e0480fb372f7d083297d4479b593d Mon Sep 17 00:00:00 2001
From: Tadas Baltrusaitis <tadyla@gmail.com>
Date: Mon, 19 Dec 2016 14:59:25 -0500
Subject: [PATCH] More travis fix attempts.

---
 .travis.yml    | 6 +++---
 CMakeLists.txt | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bb9ca9f..cfe1a9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,14 +15,14 @@ os:
   
 before_install:
   # g++4.8.1
-  - if [ "$CXX" == "g++" ]; then
+  - if [ "$CXX" = "g++" ]; then
       if [[ ${TRAVIS_OS_NAME} = linux ]]; then
         sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; 
       fi 
     fi
 
   # clang 3.4
-  - if [ "$CXX" == "clang++" ]; then
+  - if [ "$CXX" = "clang++" ]; then
       if [[ ${TRAVIS_OS_NAME} = linux ]]; then  
         sudo add-apt-repository -y ppa:h-rayflood/llvm;
       fi
@@ -55,7 +55,7 @@ before_script:
   - if [[ ${TRAVIS_OS_NAME} = linux ]]; then cd opencv; fi
   - if [[ ${TRAVIS_OS_NAME} = linux ]]; then mkdir build; fi
   - if [[ ${TRAVIS_OS_NAME} = linux ]]; then cd build; fi
-  - if [[ ${TRAVIS_OS_NAME} = linux ]]; then cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D WITH_TBB=ON -D BUILD_SHARED_LIBS=OFF ..; fi
+  - if [[ ${TRAVIS_OS_NAME} = linux ]]; then cmake -D CMAKE_BUILD_TYPE=RELEASE -D BUILD_SHARED_LIBS=OFF ..; fi
   - if [[ ${TRAVIS_OS_NAME} = linux ]]; then make -j2; fi
   - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo make -j2 install; fi
   - if [[ ${TRAVIS_OS_NAME} = linux ]]; then cd ../..; fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 210bb75..8b72357 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
 
 find_package( OpenCV REQUIRED )
+find_package( OpenCV HINTS /usr/local/Cellar/opencv3/3.1.0_4/ )
+find_package( OpenCV HINTS /usr/local/Cellar/opencv3/3.1.0_3/ )
+
 MESSAGE("OpenCV information:") 
 MESSAGE("  OpenCV_INCLUDE_DIRS: ${OpenCV_INCLUDE_DIRS}") 
 MESSAGE("  OpenCV_LIBRARIES: ${OpenCV_LIBRARIES}")