Merge pull request #15419 from OrestChura:gapi_headers_internal_flag_issue

mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00

* - headers in "infer/" and "infer/ie/" folders are included into gapi_ext_hdrs;
+ because of that a few #includes are required in the headers
- HAVE_INF_ENGINE flag check in headers "infer/ie.hpp" and "infer/ie/util.hpp" is deleted

* - the "ie/util.hpp" header is a private header now as it's used for tests; it's been moved to the scr directory to the place next to the implementation file "ie/giebackend.cpp"
- the path to this header in files "ie/giebackend.cpp" and "test/infer/gapi_infer_ie_test.cpp" is updated
- As it's private header now and explicitly depends on IE, the "HAVE_INF_ENGINE" flag check is returned

This commit is contained in:

OrestChura

2019-09-03 13:22:12 +03:00

committed by

Alexander Alekhin

parent 07f0225ca6

commit 55c1720719

5 changed files with 12 additions and 7 deletions

									
										modules/gapi/test/infer/gapi_infer_ie_test.cpp
									
		+2
		-1
	
												View File
												
				@@ -35,7 +35,8 @@

				#include <ade/util/iota_range.hpp>

				#include <opencv2/gapi/infer/ie.hpp>

				#include <opencv2/gapi/infer/ie/util.hpp>

				#include "backends/ie/util.hpp"

				namespace opencv_test

				{