From 8f8181b539736394974f22ef73c46522cd3354c0 Mon Sep 17 00:00:00 2001 From: Peter Braden Date: Fri, 22 Jun 2012 13:59:59 -0700 Subject: [PATCH] updated build script --- src/init.cc | 4 ++++ wscript | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/init.cc b/src/init.cc index b4ea110..1627e5b 100755 --- a/src/init.cc +++ b/src/init.cc @@ -1,3 +1,7 @@ +#ifdef __cplusplus + #import "opencv2/opencv.hpp" +#endif + #include "OpenCV.h" #include "Point.h" #include "Matrix.h" diff --git a/wscript b/wscript index e7b6b64..5eceddc 100755 --- a/wscript +++ b/wscript @@ -5,10 +5,14 @@ def set_options(opt): def configure(conf): conf.check_tool('compiler_cxx') conf.check_tool('node_addon') - #conf.check(lib='opencv', libpath=[ - # '/lib', '/usr/lib', '/usr/local/lib','/usr/local/include'], uselib_store='OPENCV', mandatory=True) - conf.check_cfg(package='opencv', libpath=[ - '/lib', '/usr/lib', '/usr/local/lib','/usr/local/include'], args='--cflags --libs', uselib_store='OPENCV') + conf.check_cfg(package='opencv', + atleast_version='2.3.1', + libpath=[ + '/lib', '/usr/lib', '/usr/local/lib','/usr/local/include', + '/opt/local/include', '/opt/local/lib'], + args='--cflags --libs', + uselib_store='OPENCV', + mandatory=True) def build(bld):