| Message ID | 20201016214551.2522338-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/zxing-cpp: add opencv3 optional dependency | expand |
Fabrice, All, On 2020-10-16 23:45 +0200, Fabrice Fontaine spake thusly: > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/zxing-cpp/zxing-cpp.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk > index c138c925bb..316afd6ad2 100644 > --- a/package/zxing-cpp/zxing-cpp.mk > +++ b/package/zxing-cpp/zxing-cpp.mk > @@ -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. > ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON > else > ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=OFF > -- > 2.28.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2020.02.x and 2020.08.x, thanks.
diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index c138c925bb..316afd6ad2 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -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
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/zxing-cpp/zxing-cpp.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)