From d2ee9b16fa7d4d3c2ded648a7606152209813a34 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Thu, 2 Aug 2018 11:19:07 -0400 Subject: opencv: Fixup include to follow new standard This uses the new path for OpenCV headers. OpenCV now have master headers files per modules, which reduce the amount of required includes. Note that HIGHGUI was included to get the imgcodecs includes, which I fixed, though the master header is missing the C headers, so I included that directly. All the image stuff should be ported to C++ eventually. Finally, this patch also update the header checks to reflect the modules that are really being used. --- meson.build | 2 -- 1 file changed, 2 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 5f1c430be..b2042e471 100644 --- a/meson.build +++ b/meson.build @@ -77,14 +77,12 @@ cdata = configuration_data() check_headers = [ ['HAVE_DLFCN_H', 'dlfcn.h'], ['HAVE_FCNTL_H', 'fcntl.h'], - ['HAVE_HIGHGUI_H', 'highgui.h'], ['HAVE_INTTYPES_H', 'inttypes.h'], ['HAVE_MEMORY_H', 'memory.h'], ['HAVE_MSACM_H', 'msacm.h'], ['HAVE_NETINET_IN_H', 'netinet/in.h'], ['HAVE_NETINET_IP_H', 'netinet/ip.h'], ['HAVE_NETINET_TCP_H', 'netinet/tcp.h'], - ['HAVE_OPENCV2_HIGHGUI_HIGHGUI_C_H', 'opencv2/highgui/highgui_c.h'], ['HAVE_PTHREAD_H', 'pthread.h'], ['HAVE_STDINT_H', 'stdint.h'], ['HAVE_STDLIB_H', 'stdlib.h'], -- cgit v1.2.1