From e703e13ada5afbf3e1307103b3dfb509379df99a Mon Sep 17 00:00:00 2001 From: Paul Zabelin Date: Thu, 24 Jan 2019 20:19:19 -0800 Subject: [PATCH] use OpenCV version 2 --- .circleci/config.yml | 6 +++--- Example/PerspectiveTransform.xcodeproj/project.pbxproj | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 96e85e2..aaeb920 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,10 +47,10 @@ jobs: steps: - pod-install - restore_cache: - key: 1-opencv-{{ .Branch }} - - run: for package in opencv xz $(brew deps opencv); do brew link $package || brew install $package; done + key: 2-opencv-{{ .Branch }} + - run: for package in opencv@2 xz $(brew deps opencv@2); do brew link $package || brew install $package; done - save_cache: - key: 1-opencv-{{ .Branch }} + key: 2-opencv-{{ .Branch }} paths: - /usr/local/Cellar/ - run: diff --git a/Example/PerspectiveTransform.xcodeproj/project.pbxproj b/Example/PerspectiveTransform.xcodeproj/project.pbxproj index a492d66..7fd15cf 100644 --- a/Example/PerspectiveTransform.xcodeproj/project.pbxproj +++ b/Example/PerspectiveTransform.xcodeproj/project.pbxproj @@ -795,10 +795,10 @@ buildSettings = { HEADER_SEARCH_PATHS = ( "$(inherited)", - /usr/local/include, + "/usr/local/opt/opencv@2/include", ); INFOPLIST_FILE = Specs/Info.plist; - LIBRARY_SEARCH_PATHS = /usr/local/lib/; + LIBRARY_SEARCH_PATHS = "/usr/local/opt/opencv@2/lib/"; MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "paulz.github.io.PerspectiveTransform.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -813,10 +813,10 @@ buildSettings = { HEADER_SEARCH_PATHS = ( "$(inherited)", - /usr/local/include, + "/usr/local/opt/opencv@2/include", ); INFOPLIST_FILE = Specs/Info.plist; - LIBRARY_SEARCH_PATHS = /usr/local/lib/; + LIBRARY_SEARCH_PATHS = "/usr/local/opt/opencv@2/lib/"; MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_BUNDLE_IDENTIFIER = "paulz.github.io.PerspectiveTransform.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)";