Merge pull request #15419 from OrestChura:gapi_headers_internal_flag_issue
authorOrestChura <43438132+OrestChura@users.noreply.github.com>
Tue, 3 Sep 2019 10:22:12 +0000 (13:22 +0300)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 3 Sep 2019 10:22:12 +0000 (13:22 +0300)
commit55c1720719e654f44f6162643374b877b192fc52
tree193d90225e82ed21c6a2e2ad581b4997bd0cc5ef
parent07f0225ca6b36f3615bf94ec48090eebba9b04ff
Merge pull request #15419 from OrestChura:gapi_headers_internal_flag_issue

* - 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
modules/gapi/CMakeLists.txt
modules/gapi/include/opencv2/gapi/infer/ie.hpp
modules/gapi/src/backends/ie/giebackend.cpp
modules/gapi/src/backends/ie/util.hpp [moved from modules/gapi/include/opencv2/gapi/infer/ie/util.hpp with 87% similarity]
modules/gapi/test/infer/gapi_infer_ie_test.cpp