diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2021-08-25 16:10:36 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-08-27 09:55:39 +0800 |
commit | 011b2d6c1922d99ac90827cd894616943e592d4f (patch) | |
tree | 90e704a61764d5ce288148973f33201bd68897cc /dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-InferenceEngineConfig.cmake-set-the-right-paths.patch | |
parent | 036ca44cbb943f1bf46ad060d6f2e58ff276dfa7 (diff) | |
download | meta-intel-011b2d6c1922d99ac90827cd894616943e592d4f.tar.gz |
openvino-inference-engine: upgrade 2021.3 -> 2021.4
Refresh patches and add zlib to DEPENDS. Also fetch pybind11 as it's
needed by ngraph.
Release notes:
https://software.intel.com/content/www/us/en/develop/articles/openvino-2021-4-lts-relnotes.html
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-InferenceEngineConfig.cmake-set-the-right-paths.patch')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-InferenceEngineConfig.cmake-set-the-right-paths.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-InferenceEngineConfig.cmake-set-the-right-paths.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-InferenceEngineConfig.cmake-set-the-right-paths.patch deleted file mode 100644 index 31a7f7ff..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-InferenceEngineConfig.cmake-set-the-right-paths.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From 13a9e6fbe3e62720d088e750de73483f2b74a855 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 14 Jul 2021 00:55:31 +0800 | ||
4 | Subject: [PATCH] InferenceEngineConfig.cmake: set the right paths | ||
5 | |||
6 | Make sure that the projects using cmake to locate the libraries | ||
7 | are able to do so. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | .../cmake/templates/InferenceEngineConfig.cmake.in | 8 ++++---- | ||
14 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
15 | |||
16 | diff --git a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in | ||
17 | index 5ede817bbf..83d258834b 100644 | ||
18 | --- a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in | ||
19 | +++ b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in | ||
20 | @@ -74,7 +74,7 @@ else() | ||
21 | ext_message(FATAL_ERROR "inference_engine root directory is not found") | ||
22 | endif() | ||
23 | |||
24 | - find_path(IE_INCLUDE_DIR inference_engine.hpp "${IE_ROOT_DIR}/include" NO_DEFAULT_PATH) | ||
25 | + find_path(IE_INCLUDE_DIR inference_engine.hpp "${IE_ROOT_DIR}/include") | ||
26 | |||
27 | set(IE_LIB_DIR "${IE_ROOT_DIR}/lib/${_ARCH}") | ||
28 | set(IE_LIB_REL_DIR "${IE_LIB_DIR}/Release") | ||
29 | @@ -89,8 +89,8 @@ else() | ||
30 | find_library(IE_RELEASE_LIBRARY inference_engine@IE_RELEASE_POSTFIX_MAC@ "${IE_LIB_DIR}" NO_DEFAULT_PATH) | ||
31 | find_library(IE_C_API_RELEASE_LIBRARY inference_engine_c_api@IE_RELEASE_POSTFIX_MAC@ "${IE_LIB_DIR}" NO_DEFAULT_PATH) | ||
32 | else() | ||
33 | - find_library(IE_RELEASE_LIBRARY inference_engine@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}" NO_DEFAULT_PATH) | ||
34 | - find_library(IE_C_API_RELEASE_LIBRARY inference_engine_c_api@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}" NO_DEFAULT_PATH) | ||
35 | + find_library(IE_RELEASE_LIBRARY inference_engine@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}") | ||
36 | + find_library(IE_C_API_RELEASE_LIBRARY inference_engine_c_api@IE_RELEASE_POSTFIX_LIN@ "${IE_LIB_DIR}") | ||
37 | endif() | ||
38 | |||
39 | find_package_handle_standard_args( InferenceEngine | ||
40 | @@ -163,6 +163,6 @@ else() | ||
41 | IE::inference_engine_c_api) | ||
42 | |||
43 | set(IE_EXTERNAL_DIR "${IE_ROOT_DIR}/external") | ||
44 | - include("${IE_ROOT_DIR}/share/ie_parallel.cmake") | ||
45 | + include("$ENV{PKG_CONFIG_SYSROOT_DIR}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/InferenceEngine/ie_parallel.cmake") | ||
46 | endif() | ||
47 | endif() | ||
48 | -- | ||
49 | 2.32.0 | ||
50 | |||