* [Buildroot] [PATCH 1/1] package/zxing-cpp: add opencv3 optional dependency
@ 2020-10-16 21:45 Fabrice Fontaine
2020-10-17 12:15 ` Yann E. MORIN
2020-10-28 22:15 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2020-10-16 21:45 UTC (permalink / raw)
To: buildroot
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)
ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON
else
ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=OFF
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/zxing-cpp: add opencv3 optional dependency
2020-10-16 21:45 [Buildroot] [PATCH 1/1] package/zxing-cpp: add opencv3 optional dependency Fabrice Fontaine
@ 2020-10-17 12:15 ` Yann E. MORIN
2020-10-28 22:15 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2020-10-17 12:15 UTC (permalink / raw)
To: buildroot
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 at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/zxing-cpp: add opencv3 optional dependency
2020-10-16 21:45 [Buildroot] [PATCH 1/1] package/zxing-cpp: add opencv3 optional dependency Fabrice Fontaine
2020-10-17 12:15 ` Yann E. MORIN
@ 2020-10-28 22:15 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2020-10-28 22:15 UTC (permalink / raw)
To: 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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-28 22:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-16 21:45 [Buildroot] [PATCH 1/1] package/zxing-cpp: add opencv3 optional dependency Fabrice Fontaine
2020-10-17 12:15 ` Yann E. MORIN
2020-10-28 22:15 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox