diff options
| author | Yi Sun <yi.sun@intel.com> | 2015-03-09 13:31:29 +0800 |
|---|---|---|
| committer | Yi Sun <yi.sun@intel.com> | 2015-03-09 13:31:29 +0800 |
| commit | 0d3028d8a9f3c1b80d994a4bfd9905762688c964 (patch) | |
| tree | fd5be496fa6628728a49e7a79fe6a24d910f6ece | |
| parent | b73639e673bec94be60b9319efc010e55f353532 (diff) | |
Initialize QRdecode4Display.
Signed-off-by: Yi Sun <yi.sun@intel.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 9 | ||||
| -rw-r--r-- | tests/Makefile.sources | 2 | ||||
| -rw-r--r-- | tests/QRdecode4Display.cpp (renamed from tests/QRdecode4Display.c) | 0 |
4 files changed, 9 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 3e77f7d..cdfc568 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,7 @@ AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2]) AM_PATH_PYTHON([3],, [:]) AC_PROG_CC +AC_PROG_CXX AM_PROG_LEX AC_PROG_YACC @@ -86,6 +87,7 @@ PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.52 libdrm]) PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext dri2proto >= 2.6], enable_overlay_xvlib=yes, enable_overlay_xvlib=no) PKG_CHECK_MODULES(OVERLAY_XLIB, [cairo-xlib dri2proto >= 2.6], enable_overlay_xlib=yes, enable_overlay_xlib=no) +PKG_CHECK_MODULES(OPENCV, [opencv >= 1]) AM_CONDITIONAL(BUILD_OVERLAY_XVLIB, [test "x$enable_overlay_xvlib" = xyes]) AM_CONDITIONAL(BUILD_OVERLAY_XLIB, [test "x$enable_overlay_xlib" = xyes]) diff --git a/tests/Makefile.am b/tests/Makefile.am index 006555e..fc568eb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,12 +12,15 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \ -I$(srcdir)/../lib \ -include "$(srcdir)/../lib/check-ndebug.h" \ -DIGT_DATADIR=\""$(abs_srcdir)"\" \ + $(OPENCV_CFLAGS) \ $(NULL) -LDADD = ../lib/libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS) +LDADD = ../lib/libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS) -ldecodeqr -LDADD += $(CAIRO_LIBS) $(LIBUDEV_LIBS) $(GLIB_LIBS) -AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS) +LDADD += $(CAIRO_LIBS) $(LIBUDEV_LIBS) $(GLIB_LIBS) $(DECODEQR_LIBS) $(OPENCV_LIBS) +AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS) $(DECODEQR_LIBS) $(OPENCV_LIBS) + +AM_CXXFLAGS = $(AM_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS) $(DECODEQR_LIBS) $(OPENCV_LIBS) endif diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 6ab7bcf..0df59ef 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -13,7 +13,7 @@ testdisplay_SOURCES = \ testdisplay_hotplug.c \ $(NULL) -QRdecode4Display_SOURCES = QRdecode4Display.c \ +QRdecode4Display_SOURCES = QRdecode4Display.cpp \ ${NULL} TESTS_progs += testdisplay QRdecode4Display diff --git a/tests/QRdecode4Display.c b/tests/QRdecode4Display.cpp index 8324b17..8324b17 100644 --- a/tests/QRdecode4Display.c +++ b/tests/QRdecode4Display.cpp |