From aaece6921d7368577511f06c94c99dd4e9653563 Mon Sep 17 00:00:00 2001 From: Peter Braden Date: Wed, 20 Mar 2019 09:36:36 +0000 Subject: [PATCH] Fix install script --- README.md | 3 +-- src/FaceRecognizer.h | 1 + utils/find-opencv.js | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d0d0c9f..2b5ed75 100755 --- a/README.md +++ b/README.md @@ -13,8 +13,7 @@ cool, I'd love to hear about it! ## Install -You'll need OpenCV 2.3.1 or newer installed before installing node-opencv. Note -that OpenCV 3.x is not yet fully supported. +You'll need OpenCV 2.3.1 or newer installed before installing node-opencv. ## Specific for macOS Install OpenCV using brew diff --git a/src/FaceRecognizer.h b/src/FaceRecognizer.h index a147229..8e75253 100644 --- a/src/FaceRecognizer.h +++ b/src/FaceRecognizer.h @@ -8,6 +8,7 @@ namespace cv { using cv::face::FaceRecognizer; } #else +#warning using opencv2 contrib #include "opencv2/contrib/contrib.hpp" #endif diff --git a/utils/find-opencv.js b/utils/find-opencv.js index ece7a66..be1cfa8 100644 --- a/utils/find-opencv.js +++ b/utils/find-opencv.js @@ -2,7 +2,14 @@ var exec = require("child_process").exec; var fs = require("fs"); -var flag = "--exists"; + +var flags = { + '--cflags' : '--cflags', + '--libs' : '--libs' +} +var flag = flags[process.argv[2]] || '--exists' + + // Normally |pkg-config opencv ...| could report either OpenCV 2.x or OpenCV 3.y // depending on what is installed. To enable both 2.x and 3.y to co-exist on