package/zxing-cpp: add opencv3 optional dependency
PATCH 1/1 package/zxing-cpp: add opencv3 optional dependency
Signed-off-by Fabrice Fontaine <[email protected]>
--- package/zxing-cpp/zxing-cpp.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
package/zxing-cpp/zxing-cpp.mk +2 -2
@@ -16,8 +16,8 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) ZXING_CPP_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),y) -ZXING_CPP_DEPENDENCIES += opencv +ifeq ($(BR2_PACKAGE_OPENCV_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),y) +ZXING_CPP_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENCV),opencv,opencv3) ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON else ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=OFF
Signature · 1 line
2.28.0
PATCH 1/1 package/zxing-cpp: add opencv3 optional dependency
Fabrice, All,
On 2020-10-16 23:45 +0200, Fabrice Fontaine spake thusly:
Quoted 10 lines
Signed-off-by Fabrice Fontaine <[email protected]>--- package/zxing-cpp/zxing-cpp.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)package/zxing-cpp/zxing-cpp.mk +0
-0
package/zxing-cpp/zxing-cpp.mk ifeq ($(BR2_PACKAGE_LIBICONV),y) · line 20
Quoted 7 lines
package/zxing-cpp/zxing-cpp.mk +2
-2@@ -16,8 +16,8 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) ZXING_CPP_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),y) -ZXING_CPP_DEPENDENCIES += opencv +ifeq ($(BR2_PACKAGE_OPENCV_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),y) +ZXING_CPP_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENCV),opencv,opencv3)
I found that a separate condition was easier to read (and thus to maintain), so I did the split when applying to master. Thanks!
Regards,
Yann E. MORIN.
Quoted 10 lines
package/zxing-cpp/zxing-cpp.mk +0
-0ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON else ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=OFFSignature · 6 lines
2.28.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 package/zxing-cpp: add opencv3 optional dependency
In reply to Fabrice FontaineQuoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Signed-off-by Fabrice Fontaine <[email protected]>
Committed to 2020.02.x and 2020.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard