From 45fe3a611bddf1a087559e17677dbaf4cf887035 Mon Sep 17 00:00:00 2001 From: Tadas Baltrusaitis Date: Mon, 19 Dec 2016 15:58:46 -0500 Subject: [PATCH] Another small travis change. --- .travis.yml | 2 +- CMakeLists.txt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21e5259..c1fbac7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ before_script: - cmake -D CMAKE_BUILD_TYPE=RELEASE -D BUILD_SHARED_LIBS=OFF .. - make -j4 - sudo make -j2 install - - then cd ../.. + - cd ../.. - if [[ ${TRAVIS_OS_NAME} = linux ]]; then sudo ln /dev/null /dev/raw1394; fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b72357..9d42df8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,6 @@ 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}")