Skip to content
Snippets Groups Projects
Commit a3cf0cfe authored by Arnaud Degroote's avatar Arnaud Degroote
Browse files

[wip/histodet] Fix issues in the handling of demo option

// is not understand properly by gmake, use the right comment character.
In depend.mk, don't search for the demo file, which won't be here if you
did not build the package with demo option.
parent cd56171b
No related branches found
No related tags found
Loading
......@@ -7,7 +7,7 @@ VERSION= 1.0
CATEGORIES= image
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=histodet/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS_TRAC}histodet
PKGREVISION= 1
PKGREVISION= 2
MAINTAINER= robotpkg@laas.fr
COMMENT= Fast object detector based on histogram
......@@ -17,7 +17,7 @@ PKG_SUPPORTED_OPTIONS+= demo
PKG_OPTION_DESCR.demo?= Install demo histodet tool, including the learning tool
define PKG_OPTION_SET.demo
CMAKE_ARGS+= -DBUILD_DEMO=ON
// requiere opencv_highgui
# requiere opencv_highgui
endef
define PKG_OPTION_UNSET.demo
CMAKE_ARGS+= -DBUILD_DEMO=OFF
......
......@@ -18,7 +18,6 @@ DEPEND_ABI.histodet?= histodet>=1.0
DEPEND_DIR.histodet?= ../../wip/histodet
SYSTEM_SEARCH.histodet=\
bin/histodet_demo \
include/histodet/hsv.hpp \
lib/libhistodet.so \
'lib/pkgconfig/histodet.pc:/Version/s/[^0-9.]//gp'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment