summaryrefslogtreecommitdiffstats
path: root/dynamic-layers
diff options
context:
space:
mode:
authorChin Huat Ang <chin.huat.ang@intel.com>2019-10-17 08:34:14 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2019-10-20 23:20:21 (GMT)
commit649456856dc38086e7d43d740d68198e3395b067 (patch)
tree68a604f7a99dda2b6641b493296d20ecdf559cd7 /dynamic-layers
parentb128d14ff61d8097f779ef6c3d35a7ed84994b20 (diff)
downloadmeta-intel-649456856dc38086e7d43d740d68198e3395b067.tar.gz
dldt-inference-engine: update 2019r2 -> 2019r3
Refresh patches so that they apply cleanly on 2019r3. Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.bb (renamed from dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb)7
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch251
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch92
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Supply-firmware-at-build-time.patch44
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch16
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch22
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch15
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch (renamed from dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch)8
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch (renamed from dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mock_engine-install-to-CMAKE_INSTALL_LIBDIR.patch)6
9 files changed, 215 insertions, 246 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.bb
index 3e3dd66..21b5198 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r2.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/dldt-inference-engine_2019r3.bb
@@ -8,14 +8,13 @@ SRC_URI = "git://github.com/opencv/dldt.git;protocol=git;branch=2019 \
8 file://0001-R2-Build-fixes.patch;patchdir=../ \ 8 file://0001-R2-Build-fixes.patch;patchdir=../ \
9 file://0002-R2-Install-DLDT-headers-libs-sample-Apps.patch;patchdir=../ \ 9 file://0002-R2-Install-DLDT-headers-libs-sample-Apps.patch;patchdir=../ \
10 file://0003-use-GNUInstallDirs-on-nix.patch;patchdir=../ \ 10 file://0003-use-GNUInstallDirs-on-nix.patch;patchdir=../ \
11 file://0003-Supply-firmware-at-build-time.patch;patchdir=../ \
12 file://0004-disable-werror.patch;patchdir=../ \ 11 file://0004-disable-werror.patch;patchdir=../ \
13 file://0005-point-to-correct-location-of-ngraph-headers.patch;patchdir=../ \ 12 file://0005-point-to-correct-location-of-ngraph-headers.patch;patchdir=../ \
14 file://0001-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \ 13 file://0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \
15 file://0001-mock_engine-install-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \ 14 file://0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch;patchdir=../ \
16 file://run-ptest \ 15 file://run-ptest \
17 " 16 "
18SRCREV = "ba6e22b1b5ee4cbefcc30e8d9493cddb0bb3dfdf" 17SRCREV = "1c794d971cdd3c94de5ea4a6c9588eac63f4cc57"
19 18
20LICENSE = "Apache-2.0" 19LICENSE = "Apache-2.0"
21LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" 20LIC_FILES_CHKSUM = "file://../LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch
index 38de10f..39d4098 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-R2-Build-fixes.patch
@@ -1,31 +1,33 @@
1From 3d7373487eacf4e3283183bbc9a771cb4b97c7ab Mon Sep 17 00:00:00 2001 1From 8a5804c723c5bd396e5029f254f866f19a679cc5 Mon Sep 17 00:00:00 2001
2From: Erin Park <erin.park@intel.com> 2From: Erin Park <erin.park@intel.com>
3Date: Wed, 11 Sep 2019 09:04:23 -0700 3Date: Wed, 11 Sep 2019 09:04:23 -0700
4Subject: [PATCH] R2 Build fixes 4Subject: [PATCH 1/7] R2 Build fixes
5 5
6-Update to R3
6-linux os-release name search 7-linux os-release name search
7-Use system libraries for (OMP/TBB) 8-Use system libraries for (OMP/TBB)
8-Use system libraries for ngraph, ade, puigxml, gflags 9-Use system libraries for ngraph, ade, puigxml, gflags
9-Turn on ENABLE_PYTHON 10-Turn on ENABLE_PYTHON
10 11
11Upstream-Status: Pending [Taken from Clear Linux] 12Upstream-Status: Pending [Taken from Clear Linux and updated to R3]
12Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 13Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
14Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
13--- 15---
14 inference-engine/CMakeLists.txt | 4 +++ 16 inference-engine/CMakeLists.txt | 4 +++
15 inference-engine/cmake/dependencies.cmake | 32 +++++++++++-------- 17 inference-engine/cmake/dependencies.cmake | 30 ++++++++++++----------
16 .../cmake/developer_package.cmake | 12 +++---- 18 inference-engine/cmake/developer_package.cmake | 12 ++++-----
17 inference-engine/cmake/ie_parallel.cmake | 10 +++--- 19 inference-engine/cmake/ie_parallel.cmake | 6 ++---
18 inference-engine/cmake/linux_name.cmake | 2 +- 20 inference-engine/cmake/linux_name.cmake | 2 +-
19 inference-engine/samples/CMakeLists.txt | 2 -- 21 inference-engine/samples/CMakeLists.txt | 2 --
20 .../src/inference_engine/CMakeLists.txt | 5 +-- 22 .../src/inference_engine/CMakeLists.txt | 5 ++--
21 inference-engine/thirdparty/CMakeLists.txt | 7 ---- 23 inference-engine/thirdparty/CMakeLists.txt | 9 -------
22 8 files changed, 38 insertions(+), 36 deletions(-) 24 8 files changed, 34 insertions(+), 36 deletions(-)
23 25
24diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt 26diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
25index 0d449c9..5ee8f53 100644 27index f41d9df..a282cb4 100644
26--- a/inference-engine/CMakeLists.txt 28--- a/inference-engine/CMakeLists.txt
27+++ b/inference-engine/CMakeLists.txt 29+++ b/inference-engine/CMakeLists.txt
28@@ -59,6 +59,10 @@ add_cpplint_target(sample_cpplint 30@@ -62,6 +62,10 @@ add_cpplint_target(sample_cpplint
29 EXCLUDE_PATTERNS "thirdparty/*" "pugixml/*") 31 EXCLUDE_PATTERNS "thirdparty/*" "pugixml/*")
30 32
31 if (ENABLE_PYTHON) 33 if (ENABLE_PYTHON)
@@ -37,120 +39,114 @@ index 0d449c9..5ee8f53 100644
37 endif() 39 endif()
38 40
39diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake 41diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
40index 00a5b8e..d493426 100644 42index 682f2e5..36c3f4d 100644
41--- a/inference-engine/cmake/dependencies.cmake 43--- a/inference-engine/cmake/dependencies.cmake
42+++ b/inference-engine/cmake/dependencies.cmake 44+++ b/inference-engine/cmake/dependencies.cmake
43@@ -71,11 +71,11 @@ if (WIN32) 45@@ -51,11 +51,11 @@ if (THREADING STREQUAL "OMP")
44 ENVIRONMENT "OMP" 46 ENVIRONMENT "OMP"
45 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") 47 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
46 elseif(LINUX) 48 elseif(LINUX)
47- RESOLVE_DEPENDENCY(OMP 49- RESOLVE_DEPENDENCY(OMP
48- ARCHIVE_LIN "iomp.tgz" 50- ARCHIVE_LIN "iomp.tgz"
49- TARGET_PATH "${TEMP}/omp" 51- TARGET_PATH "${TEMP}/omp"
50- ENVIRONMENT "OMP" 52- ENVIRONMENT "OMP"
51- VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") 53- VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
52+# RESOLVE_DEPENDENCY(OMP 54+ #RESOLVE_DEPENDENCY(OMP
53+# ARCHIVE_LIN "iomp.tgz" 55+ # ARCHIVE_LIN "iomp.tgz"
54+# TARGET_PATH "${TEMP}/omp" 56+ # TARGET_PATH "${TEMP}/omp"
55+# ENVIRONMENT "OMP" 57+ # ENVIRONMENT "OMP"
56+# VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") 58+ # VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
57 else(APPLE) 59 else(APPLE)
58 RESOLVE_DEPENDENCY(OMP 60 RESOLVE_DEPENDENCY(OMP
59 ARCHIVE_MAC "iomp_20190130_mac.tgz" 61 ARCHIVE_MAC "iomp_20190130_mac.tgz"
60@@ -83,8 +83,11 @@ else(APPLE) 62@@ -63,8 +63,10 @@ if (THREADING STREQUAL "OMP")
61 ENVIRONMENT "OMP" 63 ENVIRONMENT "OMP"
62 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") 64 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
63 endif() 65 endif()
64-log_rpath_from_dir(OMP "${OMP}/lib") 66- log_rpath_from_dir(OMP "${OMP}/lib")
65-debug_message(STATUS "intel_omp=" ${OMP}) 67- debug_message(STATUS "intel_omp=" ${OMP})
66+ 68+ if (NOT LINUX)
67+if (OMP) 69+ log_rpath_from_dir(OMP "${OMP}/lib")
68+ log_rpath_from_dir(OMP "${OMP}/lib") 70+ debug_message(STATUS "intel_omp=" ${OMP})
69+ debug_message(STATUS "intel_omp=" ${OMP}) 71+ endif ()
70+endif ()
71 endif () 72 endif ()
72 73
73 ## TBB package 74 ## TBB package
74@@ -97,10 +100,10 @@ if (WIN32) 75@@ -77,10 +79,10 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
75 ENVIRONMENT "TBBROOT" 76 ENVIRONMENT "TBBROOT"
76 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") 77 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
77 elseif(LINUX) 78 elseif(LINUX)
78- RESOLVE_DEPENDENCY(TBB 79- RESOLVE_DEPENDENCY(TBB
79- ARCHIVE_LIN "tbb2019_20181010_lin.tgz" 80- ARCHIVE_LIN "tbb2019_20181010_lin.tgz"
80- TARGET_PATH "${TEMP}/tbb" 81- TARGET_PATH "${TEMP}/tbb"
81- ENVIRONMENT "TBBROOT") 82- ENVIRONMENT "TBBROOT")
82+# RESOLVE_DEPENDENCY(TBB 83+ #RESOLVE_DEPENDENCY(TBB
83+# ARCHIVE_LIN "tbb2019_20181010_lin.tgz" 84+ # ARCHIVE_LIN "tbb2019_20181010_lin.tgz"
84+# TARGET_PATH "${TEMP}/tbb" 85+ # TARGET_PATH "${TEMP}/tbb"
85+# ENVIRONMENT "TBBROOT") 86+ # ENVIRONMENT "TBBROOT")
86 else(APPLE) 87 else(APPLE)
87 RESOLVE_DEPENDENCY(TBB 88 RESOLVE_DEPENDENCY(TBB
88 ARCHIVE_MAC "tbb2019_20190414_mac.tgz" 89 ARCHIVE_MAC "tbb2019_20190414_v1_mac.tgz"
89@@ -108,8 +111,11 @@ else(APPLE) 90@@ -88,8 +90,10 @@ if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
90 ENVIRONMENT "TBBROOT" 91 ENVIRONMENT "TBBROOT"
91 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*") 92 VERSION_REGEX ".*_([a-z]*_([a-z0-9]+\\.)*[0-9]+).*")
92 endif() 93 endif()
93-log_rpath_from_dir(TBB "${TBB}/lib") 94- log_rpath_from_dir(TBB "${TBB}/lib")
94-debug_message(STATUS "tbb=" ${TBB}) 95- debug_message(STATUS "tbb=" ${TBB})
95+ 96+ if (NOT LINUX)
96+if (TBB) 97+ log_rpath_from_dir(TBB "${TBB}/lib")
97+ log_rpath_from_dir(TBB "${TBB}/lib") 98+ debug_message(STATUS "tbb=" ${TBB})
98+ debug_message(STATUS "tbb=" ${TBB}) 99+ endif ()
99+endif ()
100 endif () 100 endif ()
101 101
102 if (ENABLE_OPENCV) 102 if (ENABLE_OPENCV)
103diff --git a/inference-engine/cmake/developer_package.cmake b/inference-engine/cmake/developer_package.cmake 103diff --git a/inference-engine/cmake/developer_package.cmake b/inference-engine/cmake/developer_package.cmake
104index 52e0fef..06ba167 100644 104index a27143d..950ccf4 100644
105--- a/inference-engine/cmake/developer_package.cmake 105--- a/inference-engine/cmake/developer_package.cmake
106+++ b/inference-engine/cmake/developer_package.cmake 106+++ b/inference-engine/cmake/developer_package.cmake
107@@ -95,12 +95,12 @@ if(NOT UNIX) 107@@ -93,12 +93,12 @@ if(NOT UNIX)
108 set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}) 108 set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER})
109 set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY 109 set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY
110 else() 110 else()
111- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) 111- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
112- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) 112- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
113- set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) 113- set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
114- set(CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) 114- set(CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
115- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) 115- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
116- set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) 116- set(LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
117+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) 117+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
118+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) 118+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
119+ set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) 119+ set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
120+ set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) 120+ set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
121+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) 121+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE})
122+ set(LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) 122+ set(LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${BIN_FOLDER}/${CMAKE_BUILD_TYPE}/lib)
123 set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib) 123 set(LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib)
124 endif() 124 endif()
125 125
126diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake 126diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
127index 8265701..9d4a884 100644 127index 97e8c5e..9b03652 100644
128--- a/inference-engine/cmake/ie_parallel.cmake 128--- a/inference-engine/cmake/ie_parallel.cmake
129+++ b/inference-engine/cmake/ie_parallel.cmake 129+++ b/inference-engine/cmake/ie_parallel.cmake
130@@ -22,9 +22,9 @@ function(set_ie_threading_interface_for TARGET_NAME) 130@@ -36,8 +36,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
131 endif () 131 endif ()
132 132
133 if (NOT TBB_INCLUDE_DIRS OR NOT TBB_LIBRARIES_RELEASE) 133 if (NOT TBB_INCLUDE_DIRS OR NOT TBB_LIBRARIES_RELEASE)
134- find_path(TBB_INCLUDE_DIRS tbb/tbb.h ${incl_path} NO_DEFAULT_PATH) 134- find_path(TBB_INCLUDE_DIRS tbb/tbb.h ${incl_path} NO_DEFAULT_PATH)
135- find_library(TBB_LIBRARIES_RELEASE tbb ${lib_rel_path} NO_DEFAULT_PATH) 135- find_library(TBB_LIBRARIES_RELEASE tbb ${lib_rel_path} NO_DEFAULT_PATH)
136- find_library(TBB_LIBRARIES_DEBUG tbb_debug ${lib_dbg_path} NO_DEFAULT_PATH) 136+ find_path(TBB_INCLUDE_DIRS tbb/tbb.h)
137+ find_path(TBB_INCLUDE_DIRS tbb/tbb.h) 137+ find_library(TBB_LIBRARIES_RELEASE tbb)
138+ find_library(TBB_LIBRARIES_RELEASE tbb) 138 ext_message(STATUS "TBB include: ${TBB_INCLUDE_DIRS}")
139+ find_library(TBB_LIBRARIES_DEBUG tbb) 139 ext_message(STATUS "TBB Release lib: ${TBB_LIBRARIES_RELEASE}")
140 ext_message(STATUS "TBB include: ${TBB_INCLUDE_DIRS}") 140 if (NOT LINUX)
141 ext_message(STATUS "TBB Release lib: ${TBB_LIBRARIES_RELEASE}") 141@@ -98,7 +98,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
142 ext_message(STATUS "TBB Debug lib: ${TBB_LIBRARIES_DEBUG}")
143@@ -78,8 +78,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
144 endif () 142 endif ()
145 143
146 if (NOT OMP_LIBRARIES_RELEASE) 144 if (NOT OMP_LIBRARIES_RELEASE)
147- find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name} ${lib_rel_path} NO_DEFAULT_PATH) 145- find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name} ${lib_rel_path} NO_DEFAULT_PATH)
148- find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name} ${lib_dbg_path} NO_DEFAULT_PATH)
149+ find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name}) 146+ find_library(OMP_LIBRARIES_RELEASE ${omp_lib_name})
150+ find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name})
151 ext_message(STATUS "OMP Release lib: ${OMP_LIBRARIES_RELEASE}") 147 ext_message(STATUS "OMP Release lib: ${OMP_LIBRARIES_RELEASE}")
152 ext_message(STATUS "OMP Debug lib: ${OMP_LIBRARIES_DEBUG}") 148 if (NOT LINUX)
153 endif () 149 find_library(OMP_LIBRARIES_DEBUG ${omp_lib_name} ${lib_dbg_path} NO_DEFAULT_PATH)
154diff --git a/inference-engine/cmake/linux_name.cmake b/inference-engine/cmake/linux_name.cmake 150diff --git a/inference-engine/cmake/linux_name.cmake b/inference-engine/cmake/linux_name.cmake
155index 6713808..7e5e47a 100644 151index 6713808..7e5e47a 100644
156--- a/inference-engine/cmake/linux_name.cmake 152--- a/inference-engine/cmake/linux_name.cmake
@@ -165,7 +161,7 @@ index 6713808..7e5e47a 100644
165 set(name_regex "NAME=\"([^ \"\n]*).*\"\n") 161 set(name_regex "NAME=\"([^ \"\n]*).*\"\n")
166 set(version_regex "VERSION=\"([0-9]+(\\.[0-9]+)?)[^\n]*\"") 162 set(version_regex "VERSION=\"([0-9]+(\\.[0-9]+)?)[^\n]*\"")
167diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt 163diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
168index d354f64..3802624 100644 164index d3a094c..884b0a6 100644
169--- a/inference-engine/samples/CMakeLists.txt 165--- a/inference-engine/samples/CMakeLists.txt
170+++ b/inference-engine/samples/CMakeLists.txt 166+++ b/inference-engine/samples/CMakeLists.txt
171@@ -91,8 +91,6 @@ set (GFLAGS_IS_SUBPROJECT TRUE) 167@@ -91,8 +91,6 @@ set (GFLAGS_IS_SUBPROJECT TRUE)
@@ -178,10 +174,10 @@ index d354f64..3802624 100644
178 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") 174 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
179 endif() 175 endif()
180diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt 176diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
181index f3514ed..37a0744 100644 177index f4b34ad..2604c32 100644
182--- a/inference-engine/src/inference_engine/CMakeLists.txt 178--- a/inference-engine/src/inference_engine/CMakeLists.txt
183+++ b/inference-engine/src/inference_engine/CMakeLists.txt 179+++ b/inference-engine/src/inference_engine/CMakeLists.txt
184@@ -97,12 +97,13 @@ target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR} 180@@ -116,6 +116,7 @@ target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR}
185 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src") 181 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src")
186 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src") 182 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src")
187 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv") 183 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv")
@@ -189,6 +185,8 @@ index f3514ed..37a0744 100644
189 185
190 if(ENABLE_MKL_DNN) 186 if(ENABLE_MKL_DNN)
191 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak") 187 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak")
188@@ -125,7 +126,7 @@ if(ENABLE_UNICODE_PATH_SUPPORT)
189 target_compile_definitions(${TARGET_NAME} PUBLIC ENABLE_UNICODE_PATH_SUPPORT)
192 endif() 190 endif()
193 191
194-set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) 192-set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
@@ -196,8 +194,8 @@ index f3514ed..37a0744 100644
196 194
197 # Static library used for unit tests which are always built 195 # Static library used for unit tests which are always built
198 196
199@@ -132,7 +133,7 @@ if(WIN32) 197@@ -159,7 +160,7 @@ if(ENABLE_UNICODE_PATH_SUPPORT)
200 target_compile_definitions(${TARGET_NAME}_s PRIVATE -DNOMINMAX) 198 target_compile_definitions(${TARGET_NAME}_s PUBLIC ENABLE_UNICODE_PATH_SUPPORT)
201 endif() 199 endif()
202 200
203-set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s) 201-set_target_properties(${TARGET_NAME}_s PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}_s)
@@ -206,31 +204,32 @@ index f3514ed..37a0744 100644
206 target_link_libraries(${TARGET_NAME}_s PRIVATE fluid 204 target_link_libraries(${TARGET_NAME}_s PRIVATE fluid
207 PRIVATE ngraph 205 PRIVATE ngraph
208diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt 206diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
209index 5a4b259..7208a0f 100644 207index 54de20f..4ea20f5 100644
210--- a/inference-engine/thirdparty/CMakeLists.txt 208--- a/inference-engine/thirdparty/CMakeLists.txt
211+++ b/inference-engine/thirdparty/CMakeLists.txt 209+++ b/inference-engine/thirdparty/CMakeLists.txt
212@@ -7,12 +7,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") 210@@ -35,10 +35,6 @@ function(build_with_lto)
213 set(CMAKE_CC_FLAGS "${CMAKE_CC_FLAGS} -Wno-unknown-warning-option -Wno-inconsistent-missing-override -Wno-pass-failed") 211 set(CMAKE_RANLIB "gcc-ranlib")
214 endif() 212 endif()
215 213
216-add_subdirectory(pugixml) 214- add_subdirectory(pugixml)
217-export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake") 215- export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake")
218-export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") 216- export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
219- 217-
220 add_subdirectory(stb_lib) 218 if (TARGET pugixml_mt)
221-add_subdirectory(ade) 219 export(TARGETS pugixml_mt NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake")
220 export(TARGETS pugixml_mt NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
221@@ -46,11 +42,6 @@ function(build_with_lto)
222 222
223 if (ENABLE_CLDNN) 223 add_subdirectory(stb_lib)
224 set(CLDNN__OUTPUT_BIN_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
225@@ -40,8 +35,6 @@ if (UNIX OR APPLE AND ${CMAKE_BUILD_TYPE} STREQUAL "Release")
226 add_definitions(-fvisibility=default)
227 endif()
228 224
229-include(ngraph.cmake) 225- add_subdirectory(ade)
226- export(TARGETS ade NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
227-
228- include(ngraph.cmake)
230- 229-
231 if (UNIX OR APPLE AND ${CMAKE_BUILD_TYPE} STREQUAL "Release") 230 add_subdirectory(fluid/modules/gapi)
232 remove_definitions(-fvisibility=default) 231 export(TARGETS fluid NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
233 add_definitions(-fvisibility=hidden) 232 endfunction()
234-- 233--
2352.23.0 2342.7.4
236 235
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch
index 01b6ade..7fab779 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-R2-Install-DLDT-headers-libs-sample-Apps.patch
@@ -1,8 +1,9 @@
1From d751c5330eb512c0deb49d640b50d921b7466f89 Mon Sep 17 00:00:00 2001 1From d73cd3c504e1409861da0b6879ea0dbd4572e706 Mon Sep 17 00:00:00 2001
2From: Erin Park <erin.park@intel.com> 2From: Erin Park <erin.park@intel.com>
3Date: Wed, 11 Sep 2019 10:33:58 -0700 3Date: Wed, 11 Sep 2019 10:33:58 -0700
4Subject: [PATCH] R2 Install DLDT headers, libs, sample Apps 4Subject: [PATCH 2/7] R2 Install DLDT headers, libs, sample Apps
5 5
6-Update to R3
6-Libraries to /usr/lib64 7-Libraries to /usr/lib64
7-Headers to /usr/include 8-Headers to /usr/include
8-Sample Apps executable to /usr/bin 9-Sample Apps executable to /usr/bin
@@ -12,38 +13,38 @@ Subject: [PATCH] R2 Install DLDT headers, libs, sample Apps
12-Create targets_cpu_extension.cmake 13-Create targets_cpu_extension.cmake
13 14
14Upstream-Status: Pending [Taken from Clear Linux with changes to install 15Upstream-Status: Pending [Taken from Clear Linux with changes to install
15libs at CMAKE_INSTALL_LIBDIR instead of hardcoded lib64] 16libs at CMAKE_INSTALL_LIBDIR instead of hardcoded lib64 and update to R3]
16Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 17Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
17 18Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
18--- 19---
19 inference-engine/CMakeLists.txt | 2 ++ 20 inference-engine/CMakeLists.txt | 2 ++
20 inference-engine/cmake/config.cmake.in | 1 + 21 inference-engine/cmake/config.cmake.in | 1 +
21 inference-engine/ie_bridges/python/CMakeLists.txt | 2 +- 22 inference-engine/ie_bridges/python/CMakeLists.txt | 2 +-
22 .../src/openvino/inference_engine/CMakeLists.txt | 4 +++- 23 .../src/openvino/inference_engine/CMakeLists.txt | 4 +++-
23 inference-engine/samples/CMakeLists.txt | 9 +-------- 24 inference-engine/samples/CMakeLists.txt | 9 +-------
24 .../samples/common/format_reader/CMakeLists.txt | 2 ++ 25 .../samples/common/format_reader/CMakeLists.txt | 2 ++
25 inference-engine/src/CMakeLists.txt | 4 +++- 26 inference-engine/src/CMakeLists.txt | 4 +++-
26 inference-engine/src/extension/CMakeLists.txt | 5 ++++- 27 inference-engine/src/extension/CMakeLists.txt | 5 ++++-
27 inference-engine/src/hetero_plugin/CMakeLists.txt | 1 + 28 inference-engine/src/hetero_plugin/CMakeLists.txt | 2 ++
28 .../src/inference_engine/CMakeLists.txt | 22 +++++++++++++++++++--- 29 .../src/inference_engine/CMakeLists.txt | 25 ++++++++++++++++++----
29 .../src/inference_engine/ie_util_internal.cpp | 7 ++++--- 30 .../src/inference_engine/ie_util_internal.cpp | 7 +++---
30 inference-engine/src/mkldnn_plugin/CMakeLists.txt | 1 + 31 inference-engine/src/mkldnn_plugin/CMakeLists.txt | 1 +
31 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 ++ 32 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 ++
32 inference-engine/tests/unit/CMakeLists.txt | 2 ++ 33 inference-engine/tests/unit/CMakeLists.txt | 2 ++
33 14 files changed, 46 insertions(+), 18 deletions(-) 34 14 files changed, 49 insertions(+), 19 deletions(-)
34 35
35diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt 36diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
36index 5ee8f53..734fb45 100644 37index a282cb4..abb4de4 100644
37--- a/inference-engine/CMakeLists.txt 38--- a/inference-engine/CMakeLists.txt
38+++ b/inference-engine/CMakeLists.txt 39+++ b/inference-engine/CMakeLists.txt
39@@ -67,3 +67,5 @@ if (ENABLE_PYTHON) 40@@ -70,3 +70,5 @@ if (ENABLE_PYTHON)
40 endif() 41 endif()
41 42
42 add_cpplint_report_target() 43 add_cpplint_report_target()
43+ 44+
44+install(DIRECTORY samples DESTINATION share/doc/inference_engine) 45+install(DIRECTORY samples DESTINATION share/doc/inference_engine)
45diff --git a/inference-engine/cmake/config.cmake.in b/inference-engine/cmake/config.cmake.in 46diff --git a/inference-engine/cmake/config.cmake.in b/inference-engine/cmake/config.cmake.in
46index d9a6918..8e406be 100644 47index ebe82ee..0d7e6a4 100644
47--- a/inference-engine/cmake/config.cmake.in 48--- a/inference-engine/cmake/config.cmake.in
48+++ b/inference-engine/cmake/config.cmake.in 49+++ b/inference-engine/cmake/config.cmake.in
49@@ -7,6 +7,7 @@ if(DEFINED IE_MAIN_SOURCE_DIR AND TARGET inference_engine) 50@@ -7,6 +7,7 @@ if(DEFINED IE_MAIN_SOURCE_DIR AND TARGET inference_engine)
@@ -51,14 +52,14 @@ index d9a6918..8e406be 100644
51 else() 52 else()
52 include("${CMAKE_CURRENT_LIST_DIR}/targets.cmake") 53 include("${CMAKE_CURRENT_LIST_DIR}/targets.cmake")
53+ include("${CMAKE_CURRENT_LIST_DIR}/targets_cpu_extension.cmake") 54+ include("${CMAKE_CURRENT_LIST_DIR}/targets_cpu_extension.cmake")
54 get_target_property(InferenceEngine_INCLUDE_DIRS IE::inference_engine INTERFACE_INCLUDE_DIRECTORIES) 55 if(NOT WIN32)
55 set(InferenceEngine_LIBRARIES IE::inference_engine) 56 set_target_properties(IE::inference_engine PROPERTIES INTERFACE_COMPILE_OPTIONS "-Wno-error=deprecated-declarations")
56 endif() 57 endif()
57diff --git a/inference-engine/ie_bridges/python/CMakeLists.txt b/inference-engine/ie_bridges/python/CMakeLists.txt 58diff --git a/inference-engine/ie_bridges/python/CMakeLists.txt b/inference-engine/ie_bridges/python/CMakeLists.txt
58index 9fca214..1d21443 100644 59index bba853f..444cce9 100644
59--- a/inference-engine/ie_bridges/python/CMakeLists.txt 60--- a/inference-engine/ie_bridges/python/CMakeLists.txt
60+++ b/inference-engine/ie_bridges/python/CMakeLists.txt 61+++ b/inference-engine/ie_bridges/python/CMakeLists.txt
61@@ -49,4 +49,4 @@ find_package (InferenceEngine REQUIRED) 62@@ -53,4 +53,4 @@ endif()
62 63
63 set (PYTHON_BRIDGE_SRC_ROOT ${CMAKE_CURRENT_SOURCE_DIR}) 64 set (PYTHON_BRIDGE_SRC_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
64 add_subdirectory (src/openvino/inference_engine) 65 add_subdirectory (src/openvino/inference_engine)
@@ -78,7 +79,7 @@ index 1f46013..d6cd112 100644
78+ 79+
79+install(DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY} DESTINATION lib/${PYTHON_VERSION}/site-packages/) 80+install(DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY} DESTINATION lib/${PYTHON_VERSION}/site-packages/)
80diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt 81diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
81index 3802624..dd7b679 100644 82index 884b0a6..25f9f23 100644
82--- a/inference-engine/samples/CMakeLists.txt 83--- a/inference-engine/samples/CMakeLists.txt
83+++ b/inference-engine/samples/CMakeLists.txt 84+++ b/inference-engine/samples/CMakeLists.txt
84@@ -39,14 +39,6 @@ if(NOT(UNIX)) 85@@ -39,14 +39,6 @@ if(NOT(UNIX))
@@ -105,17 +106,17 @@ index 3802624..dd7b679 100644
105 106
106 107
107diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt 108diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
108index c4011c4..2322c3c 100644 109index a8c9caf..dffa8cb 100644
109--- a/inference-engine/samples/common/format_reader/CMakeLists.txt 110--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
110+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt 111+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
111@@ -43,3 +43,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) 112@@ -40,3 +40,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
112 113
113 export(TARGETS ${TARGET_NAME} NAMESPACE IE:: 114 export(TARGETS ${TARGET_NAME} NAMESPACE IE::
114 APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake") 115 APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
115+ 116+
116+install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) 117+install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
117diff --git a/inference-engine/src/CMakeLists.txt b/inference-engine/src/CMakeLists.txt 118diff --git a/inference-engine/src/CMakeLists.txt b/inference-engine/src/CMakeLists.txt
118index bd1793f..986040c 100644 119index 63fda2a..3a4bc48 100644
119--- a/inference-engine/src/CMakeLists.txt 120--- a/inference-engine/src/CMakeLists.txt
120+++ b/inference-engine/src/CMakeLists.txt 121+++ b/inference-engine/src/CMakeLists.txt
121@@ -37,8 +37,10 @@ set(InferenceEngine_SRC_DIRS ${CMAKE_SOURCE_DIR}/src) 122@@ -37,8 +37,10 @@ set(InferenceEngine_SRC_DIRS ${CMAKE_SOURCE_DIR}/src)
@@ -151,30 +152,34 @@ index 799a62d..fb14ebe 100644
151+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) 152+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
152+install(EXPORT ${TARGET_NAME} DESTINATION ${ConfigPackageLocation} NAMESPACE IE:: FILE targets_cpu_extension.cmake) 153+install(EXPORT ${TARGET_NAME} DESTINATION ${ConfigPackageLocation} NAMESPACE IE:: FILE targets_cpu_extension.cmake)
153diff --git a/inference-engine/src/hetero_plugin/CMakeLists.txt b/inference-engine/src/hetero_plugin/CMakeLists.txt 154diff --git a/inference-engine/src/hetero_plugin/CMakeLists.txt b/inference-engine/src/hetero_plugin/CMakeLists.txt
154index 91eb189..abc0748 100644 155index fdb1b0f..4955dc9 100644
155--- a/inference-engine/src/hetero_plugin/CMakeLists.txt 156--- a/inference-engine/src/hetero_plugin/CMakeLists.txt
156+++ b/inference-engine/src/hetero_plugin/CMakeLists.txt 157+++ b/inference-engine/src/hetero_plugin/CMakeLists.txt
157@@ -21,3 +21,4 @@ target_link_libraries(${TARGET_NAME} PRIVATE inference_engine) 158@@ -21,3 +21,5 @@ target_include_directories(${TARGET_NAME} PRIVATE
158 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) 159 )
159 160
160 add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) 161 target_link_libraries(${TARGET_NAME} PRIVATE inference_engine ade)
162+
161+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) 163+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
162diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt 164diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
163index 37a0744..c0c803d 100644 165index 2604c32..54d3828 100644
164--- a/inference-engine/src/inference_engine/CMakeLists.txt 166--- a/inference-engine/src/inference_engine/CMakeLists.txt
165+++ b/inference-engine/src/inference_engine/CMakeLists.txt 167+++ b/inference-engine/src/inference_engine/CMakeLists.txt
166@@ -90,7 +90,9 @@ if(WIN32) 168@@ -110,8 +110,11 @@ if(WIN32)
167 endif() 169 endif()
168 170
169 # Properties->C/C++->General->Additional Include Directories 171 # Properties->C/C++->General->Additional Include Directories
170-target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR} 172-target_include_directories(${TARGET_NAME} PUBLIC ${PUBLIC_HEADERS_DIR}
173- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
171+target_include_directories(${TARGET_NAME} PUBLIC 174+target_include_directories(${TARGET_NAME} PUBLIC
172+ $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include> 175+ $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include>
173+ $<INSTALL_INTERFACE:include/${TARGET_NAME}> 176+ $<INSTALL_INTERFACE:include/${TARGET_NAME}>
174 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" 177+ PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
175 "${IE_MAIN_SOURCE_DIR}/src/dumper") 178+ "${IE_MAIN_SOURCE_DIR}/src/dumper")
176 179
177@@ -114,7 +116,9 @@ add_library(${TARGET_NAME}_s STATIC 180 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src")
181 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src")
182@@ -137,7 +140,9 @@ add_library(${TARGET_NAME}_s STATIC
178 set_ie_threading_interface_for(${TARGET_NAME}_s) 183 set_ie_threading_interface_for(${TARGET_NAME}_s)
179 184
180 # Properties->C/C++->General->Additional Include Directories 185 # Properties->C/C++->General->Additional Include Directories
@@ -185,17 +190,17 @@ index 37a0744..c0c803d 100644
185 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" 190 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
186 PRIVATE "${IE_MAIN_SOURCE_DIR}/src/dumper") 191 PRIVATE "${IE_MAIN_SOURCE_DIR}/src/dumper")
187 192
188@@ -146,7 +150,8 @@ target_link_libraries(${TARGET_NAME}_s PRIVATE fluid 193@@ -173,7 +178,8 @@ target_link_libraries(${TARGET_NAME}_s PRIVATE fluid
189 add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) 194 add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
190 195
191 ie_register_plugins(MAIN_TARGET ${TARGET_NAME} 196 ie_register_plugins(MAIN_TARGET ${TARGET_NAME}
192- POSSIBLE_PLUGINS clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin) 197- POSSIBLE_PLUGINS MultiDevicePlugin HeteroPlugin clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin HDDLPlugin)
193+ P $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include> 198+ P $<BUILD_INTERFACE:${IE_MAIN_SOURCE_DIR}/include>
194++ $<INSTALL_INTERFACE:include/${TARGET_NAME}>OSSIBLE_PLUGINS clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin) 199++ $<INSTALL_INTERFACE:include/${TARGET_NAME}>OSSIBLE_PLUGINS clDNNPlugin dliaPlugin GNAPlugin MKLDNNPlugin myriadPlugin)
195 200
196 # export targets 201 # export targets
197 export(TARGETS ${TARGET_NAME} NAMESPACE IE:: FILE "${CMAKE_BINARY_DIR}/targets.cmake") 202 export(TARGETS ${TARGET_NAME} NAMESPACE IE:: FILE "${CMAKE_BINARY_DIR}/targets.cmake")
198@@ -177,3 +182,14 @@ configure_file( 203@@ -204,3 +210,14 @@ configure_file(
199 "${CMAKE_SOURCE_DIR}/cmake/share/InferenceEngineConfig-version.cmake.in" 204 "${CMAKE_SOURCE_DIR}/cmake/share/InferenceEngineConfig-version.cmake.in"
200 "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake" 205 "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig-version.cmake"
201 COPYONLY) 206 COPYONLY)
@@ -211,10 +216,10 @@ index 37a0744..c0c803d 100644
211+ 216+
212+install(FILES "$<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml" DESTINATION /usr/share/openvino/inference-engine) 217+install(FILES "$<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml" DESTINATION /usr/share/openvino/inference-engine)
213diff --git a/inference-engine/src/inference_engine/ie_util_internal.cpp b/inference-engine/src/inference_engine/ie_util_internal.cpp 218diff --git a/inference-engine/src/inference_engine/ie_util_internal.cpp b/inference-engine/src/inference_engine/ie_util_internal.cpp
214index 489ab24..2defd56 100644 219index 1a2f078..b2668a9 100644
215--- a/inference-engine/src/inference_engine/ie_util_internal.cpp 220--- a/inference-engine/src/inference_engine/ie_util_internal.cpp
216+++ b/inference-engine/src/inference_engine/ie_util_internal.cpp 221+++ b/inference-engine/src/inference_engine/ie_util_internal.cpp
217@@ -755,9 +755,10 @@ std::string getIELibraryPath() { 222@@ -760,9 +760,10 @@ std::string getIELibraryPath() {
218 GetModuleFileNameA(hm, (LPSTR)ie_library_path, sizeof(ie_library_path)); 223 GetModuleFileNameA(hm, (LPSTR)ie_library_path, sizeof(ie_library_path));
219 return getPathName(ie_library_path); 224 return getPathName(ie_library_path);
220 #else 225 #else
@@ -238,22 +243,25 @@ index d767724..80d33e6 100644
238 set_target_properties(test_${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME test_${TARGET_NAME}) 243 set_target_properties(test_${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME test_${TARGET_NAME})
239+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) 244+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
240diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt 245diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
241index b51f1a6..c005473 100644 246index 7023513..b533f07 100644
242--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt 247--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
243+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt 248+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
244@@ -36,3 +36,5 @@ if (LINUX) 249@@ -36,3 +36,5 @@ endif()
245 COMMAND "${CMAKE_COMMAND}" -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../vpu_custom_kernels 250 target_link_libraries(${TARGET_NAME}
246 $<TARGET_FILE_DIR:${TARGET_NAME}>/vpu_custom_kernels) 251 PRIVATE
247 endif() 252 ${INTEL_ITT_LIBS} inference_engine vpu_graph_transformer mvnc)
248+ 253+
249+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) 254+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
250diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt 255diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt
251index d83e088..641bef7 100644 256index 8180802..2d37b1e 100644
252--- a/inference-engine/tests/unit/CMakeLists.txt 257--- a/inference-engine/tests/unit/CMakeLists.txt
253+++ b/inference-engine/tests/unit/CMakeLists.txt 258+++ b/inference-engine/tests/unit/CMakeLists.txt
254@@ -116,3 +116,5 @@ add_test(NAME ${TARGET_NAME} 259@@ -122,3 +122,5 @@ add_test(NAME ${TARGET_NAME}
255 COMMAND ${TARGET_NAME}) 260 COMMAND ${TARGET_NAME})
256 261
257 add_dependencies(${TARGET_NAME} mock_engine) 262 add_dependencies(${TARGET_NAME} mock_engine)
258+ 263+
259+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) 264+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
265--
2662.7.4
267
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Supply-firmware-at-build-time.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Supply-firmware-at-build-time.patch
deleted file mode 100644
index 0910739..0000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-Supply-firmware-at-build-time.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From f4533f5bfce9daee08a4fea61736315fbe4ad6db Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Fri, 27 Sep 2019 11:34:36 +0800
4Subject: [PATCH] Supply firmware at build time
5
6We'd like to supply firmware when fetching the sources. Disable runtime
7fetching and point to fetched firmware instead.
8
9Upstream-Status: Submitted
10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13 inference-engine/cmake/dependencies.cmake | 18 ------------------
14 1 file changed, 18 deletions(-)
15
16diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
17index d493426..666ace6 100644
18--- a/inference-engine/cmake/dependencies.cmake
19+++ b/inference-engine/cmake/dependencies.cmake
20@@ -22,24 +22,6 @@ if(COMMAND get_linux_name)
21 get_linux_name(LINUX_OS_NAME)
22 endif()
23
24-if (ENABLE_MYRIAD)
25- RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2450
26- ARCHIVE_UNIFIED firmware_ma2450_676.zip
27- TARGET_PATH "${TEMP}/vpu/firmware/ma2450"
28- ENVIRONMENT "VPU_FIRMWARE_MA2450"
29- FOLDER)
30- debug_message(STATUS "ma2450=" ${VPU_FIRMWARE_MA2450})
31-endif ()
32-
33-if (ENABLE_MYRIAD)
34- RESOLVE_DEPENDENCY(VPU_FIRMWARE_MA2X8X
35- ARCHIVE_UNIFIED firmware_ma2x8x_mdk_R8_9.zip
36- TARGET_PATH "${TEMP}/vpu/firmware/ma2x8x"
37- ENVIRONMENT "VPU_FIRMWARE_MA2X8X"
38- FOLDER)
39- debug_message(STATUS "ma2x8x=" ${VPU_FIRMWARE_MA2X8X})
40-endif ()
41-
42 ## enable cblas_gemm from OpenBLAS package
43 if (GEMM STREQUAL "OPENBLAS")
44 if(NOT BLAS_LIBRARIES OR NOT BLAS_INCLUDE_DIRS)
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch
index ec8b9fe..c637118 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-use-GNUInstallDirs-on-nix.patch
@@ -1,18 +1,18 @@
1From 970443ce6bf31128c3517374e2890a93518d988e Mon Sep 17 00:00:00 2001 1From 32c30549fa821b0df3f5f7fdf33d7989a9f1a776 Mon Sep 17 00:00:00 2001
2From: Kevron Rees <kevron.m.rees@intel.com> 2From: Kevron Rees <kevron.m.rees@intel.com>
3Date: Wed, 3 Apr 2019 09:20:48 -0700 3Date: Wed, 3 Apr 2019 09:20:48 -0700
4Subject: [PATCH] use GNUInstallDirs on *nix 4Subject: [PATCH 3/7] use GNUInstallDirs on *nix
5 5
6Upstream-Status: Submitted [Patch taken from Clear Linux and has been submitted 6Upstream-Status: Submitted [Patch taken from Clear Linux and has been submitted
7upstream] 7upstream]
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9--- 9---
10 .../thirdparty/clDNN/CMakeLists.txt | 3 +- 10 inference-engine/thirdparty/clDNN/CMakeLists.txt | 3 +-
11 .../thirdparty/clDNN/src/CMakeLists.txt | 36 +++++++++++++++---- 11 .../thirdparty/clDNN/src/CMakeLists.txt | 36 +++++++++++++++++-----
12 2 files changed, 31 insertions(+), 8 deletions(-) 12 2 files changed, 31 insertions(+), 8 deletions(-)
13 13
14diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt 14diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
15index 624d95c..5957791 100644 15index c39fe5c..03e5bad 100644
16--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt 16--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
17+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt 17+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
18@@ -93,7 +93,8 @@ set(CLDNN__GTEST_DIR "${CLDNN__COMMON_DIR}/googletest-fused") 18@@ -93,7 +93,8 @@ set(CLDNN__GTEST_DIR "${CLDNN__COMMON_DIR}/googletest-fused")
@@ -26,10 +26,10 @@ index 624d95c..5957791 100644
26 # Prefix for all targets in internal pass. 26 # Prefix for all targets in internal pass.
27 set(CLDNN_BUILD__PROJ_NAME_PREFIX "") 27 set(CLDNN_BUILD__PROJ_NAME_PREFIX "")
28diff --git a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt 28diff --git a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
29index 132c6e4..cc88535 100644 29index 99e947e..fb25578 100644
30--- a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt 30--- a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
31+++ b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt 31+++ b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt
32@@ -247,17 +247,39 @@ target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE ${CLDNN__SYSTEM_LINK_LIBRAR 32@@ -206,17 +206,39 @@ target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE ${CLDNN__SYSTEM_LINK_LIBRAR
33 33
34 # ========================================== Installation ============================================== 34 # ========================================== Installation ==============================================
35 35
@@ -77,5 +77,5 @@ index 132c6e4..cc88535 100644
77 77
78 # ====================================================================================================== 78 # ======================================================================================================
79-- 79--
802.23.0 802.7.4
81 81
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch
index b5f52d5..ca912fd 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0004-disable-werror.patch
@@ -1,7 +1,7 @@
1From 68d6b80eb9cc87ff3598958b8a7f52b688b9436f Mon Sep 17 00:00:00 2001 1From 1ca4d5de754c6ee90f685f2706f657800cad8386 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Fri, 27 Sep 2019 20:32:08 +0800 3Date: Fri, 27 Sep 2019 20:32:08 +0800
4Subject: [PATCH] disable werror 4Subject: [PATCH 4/7] disable werror
5 5
6This shouldn't be enabled and leads to multiple errors when compiling 6This shouldn't be enabled and leads to multiple errors when compiling
7cldnn and samples. 7cldnn and samples.
@@ -9,6 +9,7 @@ cldnn and samples.
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
12--- 13---
13 inference-engine/cmake/os_flags.cmake | 1 - 14 inference-engine/cmake/os_flags.cmake | 1 -
14 inference-engine/samples/CMakeLists.txt | 1 - 15 inference-engine/samples/CMakeLists.txt | 1 -
@@ -19,19 +20,19 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
19 6 files changed, 7 deletions(-) 20 6 files changed, 7 deletions(-)
20 21
21diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake 22diff --git a/inference-engine/cmake/os_flags.cmake b/inference-engine/cmake/os_flags.cmake
22index 6a5442f..a14a1ae 100644 23index ad15859..d471246 100644
23--- a/inference-engine/cmake/os_flags.cmake 24--- a/inference-engine/cmake/os_flags.cmake
24+++ b/inference-engine/cmake/os_flags.cmake 25+++ b/inference-engine/cmake/os_flags.cmake
25@@ -48,7 +48,6 @@ if (WIN32) 26@@ -47,7 +47,6 @@ if (WIN32)
26 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${DEBUG_SYMBOLS_LINKER_FLAGS}") 27 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${DEBUG_SYMBOLS_LINKER_FLAGS}")
27 endif() 28 endif()
28 else() 29 else()
29- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type ") 30- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Werror=return-type ")
30 if (APPLE) 31 if (APPLE)
31 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument") 32 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-command-line-argument")
32 elseif(UNIX) 33 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function")
33diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt 34diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
34index dd7b679..828abe6 100644 35index 25f9f23..9aa5d5a 100644
35--- a/inference-engine/samples/CMakeLists.txt 36--- a/inference-engine/samples/CMakeLists.txt
36+++ b/inference-engine/samples/CMakeLists.txt 37+++ b/inference-engine/samples/CMakeLists.txt
37@@ -59,7 +59,6 @@ if (WIN32) 38@@ -59,7 +59,6 @@ if (WIN32)
@@ -55,10 +56,10 @@ index fb14ebe..228bb8c 100644
55 56
56 if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) 57 if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
57diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt 58diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
58index 5957791..6007be4 100644 59index 03e5bad..b9a3f5d 100644
59--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt 60--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
60+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt 61+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
61@@ -758,8 +758,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS") 62@@ -760,8 +760,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
62 MultiProcessorCompilation 63 MultiProcessorCompilation
63 DeadCodeEliminate 64 DeadCodeEliminate
64 ExtensionsEnabled 65 ExtensionsEnabled
@@ -80,7 +81,7 @@ index a541215..bed8a59 100644
80 append(CMAKE_C_FLAGS "-std=c99") 81 append(CMAKE_C_FLAGS "-std=c99")
81 append(CMAKE_CXX_FLAGS "-std=c++11 -fvisibility-inlines-hidden") 82 append(CMAKE_CXX_FLAGS "-std=c++11 -fvisibility-inlines-hidden")
82diff --git a/inference-engine/tools/CMakeLists.txt b/inference-engine/tools/CMakeLists.txt 83diff --git a/inference-engine/tools/CMakeLists.txt b/inference-engine/tools/CMakeLists.txt
83index fddfa28..a714fc1 100644 84index 3d80df3..b6cb7d8 100644
84--- a/inference-engine/tools/CMakeLists.txt 85--- a/inference-engine/tools/CMakeLists.txt
85+++ b/inference-engine/tools/CMakeLists.txt 86+++ b/inference-engine/tools/CMakeLists.txt
86@@ -24,7 +24,6 @@ endif() 87@@ -24,7 +24,6 @@ endif()
@@ -91,3 +92,6 @@ index fddfa28..a714fc1 100644
91 endif() 92 endif()
92 93
93 if (ENABLE_OPENCV) 94 if (ENABLE_OPENCV)
95--
962.7.4
97
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch
index f335d24..0a01f5a 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0005-point-to-correct-location-of-ngraph-headers.patch
@@ -1,7 +1,7 @@
1From 8335bac5c53b6cfe611a1c4987ca47aa6a60549f Mon Sep 17 00:00:00 2001 1From c17cee8005b9635699feea98bfc34ede340daf07 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Fri, 27 Sep 2019 23:06:18 +0800 3Date: Fri, 27 Sep 2019 23:06:18 +0800
4Subject: [PATCH] point to correct location of ngraph headers 4Subject: [PATCH 5/7] point to correct location of ngraph headers
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 7Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
@@ -11,10 +11,10 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11 2 files changed, 3 insertions(+), 2 deletions(-) 11 2 files changed, 3 insertions(+), 2 deletions(-)
12 12
13diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt 13diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
14index c0c803d..a4425fd 100644 14index 54d3828..4a9bedf 100644
15--- a/inference-engine/src/inference_engine/CMakeLists.txt 15--- a/inference-engine/src/inference_engine/CMakeLists.txt
16+++ b/inference-engine/src/inference_engine/CMakeLists.txt 16+++ b/inference-engine/src/inference_engine/CMakeLists.txt
17@@ -99,7 +99,7 @@ target_include_directories(${TARGET_NAME} PUBLIC 17@@ -119,7 +119,7 @@ target_include_directories(${TARGET_NAME} PUBLIC
18 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src") 18 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src")
19 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src") 19 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src")
20 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv") 20 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/ocv")
@@ -24,10 +24,10 @@ index c0c803d..a4425fd 100644
24 if(ENABLE_MKL_DNN) 24 if(ENABLE_MKL_DNN)
25 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak") 25 target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${IE_MAIN_SOURCE_DIR}/thirdparty/mkl-dnn/src/cpu/xbyak")
26diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt 26diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt
27index d83e088..29115d2 100644 27index 2d37b1e..b98d5a6 100644
28--- a/inference-engine/tests/unit/CMakeLists.txt 28--- a/inference-engine/tests/unit/CMakeLists.txt
29+++ b/inference-engine/tests/unit/CMakeLists.txt 29+++ b/inference-engine/tests/unit/CMakeLists.txt
30@@ -85,7 +85,8 @@ target_include_directories(${TARGET_NAME} PRIVATE 30@@ -83,7 +83,8 @@ target_include_directories(${TARGET_NAME} PRIVATE
31 ${IE_MAIN_SOURCE_DIR}/src/extension 31 ${IE_MAIN_SOURCE_DIR}/src/extension
32 ${IE_MAIN_SOURCE_DIR}/src/extension/common 32 ${IE_MAIN_SOURCE_DIR}/src/extension/common
33 ${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src 33 ${IE_MAIN_SOURCE_DIR}/thirdparty/ngraph/src
@@ -37,3 +37,6 @@ index d83e088..29115d2 100644
37 37
38 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) 38 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME})
39 39
40--
412.7.4
42
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch
index 24feee2..b0c0a5d 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0006-Install-clDNN-plugin-to-CMAKE_INSTALL_LIBDIR.patch
@@ -1,7 +1,7 @@
1From 1cc6ee3a1df0133e2ea7a4442bd05598a89958f6 Mon Sep 17 00:00:00 2001 1From e41aafcd133ecf7215e941e01a58fcacd5c91bd7 Mon Sep 17 00:00:00 2001
2From: Chin Huat Ang <chin.huat.ang@intel.com> 2From: Chin Huat Ang <chin.huat.ang@intel.com>
3Date: Mon, 30 Sep 2019 13:50:45 +0800 3Date: Mon, 30 Sep 2019 13:50:45 +0800
4Subject: [PATCH] Install clDNN plugin to CMAKE_INSTALL_LIBDIR 4Subject: [PATCH 6/7] Install clDNN plugin to CMAKE_INSTALL_LIBDIR
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> 7Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
@@ -10,10 +10,10 @@ Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
10 1 file changed, 2 insertions(+) 10 1 file changed, 2 insertions(+)
11 11
12diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt 12diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt
13index 211f660..76c8086 100644 13index b618084..7bdb311 100644
14--- a/inference-engine/src/cldnn_engine/CMakeLists.txt 14--- a/inference-engine/src/cldnn_engine/CMakeLists.txt
15+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt 15+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt
16@@ -23,6 +23,8 @@ target_include_directories(${TARGET_NAME} PRIVATE 16@@ -22,6 +22,8 @@ target_include_directories(${TARGET_NAME} PRIVATE
17 ${IE_MAIN_SOURCE_DIR}/src/inference_engine 17 ${IE_MAIN_SOURCE_DIR}/src/inference_engine
18 ${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src) 18 ${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src)
19 19
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mock_engine-install-to-CMAKE_INSTALL_LIBDIR.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch
index 74c260a..2a2b1ba 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-mock_engine-install-to-CMAKE_INSTALL_LIBDIR.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0007-Install-mock_engine-to-CMAKE_INSTALL_LIBDIR.patch
@@ -1,7 +1,7 @@
1From 34f3eb50ad5063bbf00ade1e9281e3c238d3216e Mon Sep 17 00:00:00 2001 1From 41c81231a9f3222423510f2b6b10f4e7024150de Mon Sep 17 00:00:00 2001
2From: Chin Huat Ang <chin.huat.ang@intel.com> 2From: Chin Huat Ang <chin.huat.ang@intel.com>
3Date: Wed, 16 Oct 2019 13:06:26 +0800 3Date: Wed, 16 Oct 2019 13:06:26 +0800
4Subject: [PATCH] mock_engine: install to CMAKE_INSTALL_LIBDIR 4Subject: [PATCH 7/7] Install mock_engine to CMAKE_INSTALL_LIBDIR
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com> 7Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
@@ -10,7 +10,7 @@ Signed-off-by: Chin Huat Ang <chin.huat.ang@intel.com>
10 1 file changed, 2 insertions(+) 10 1 file changed, 2 insertions(+)
11 11
12diff --git a/inference-engine/tests/mock_engine/CMakeLists.txt b/inference-engine/tests/mock_engine/CMakeLists.txt 12diff --git a/inference-engine/tests/mock_engine/CMakeLists.txt b/inference-engine/tests/mock_engine/CMakeLists.txt
13index a0f77cf..753c901 100644 13index a0f77cf..e23b93a 100644
14--- a/inference-engine/tests/mock_engine/CMakeLists.txt 14--- a/inference-engine/tests/mock_engine/CMakeLists.txt
15+++ b/inference-engine/tests/mock_engine/CMakeLists.txt 15+++ b/inference-engine/tests/mock_engine/CMakeLists.txt
16@@ -38,3 +38,5 @@ target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_API 16@@ -38,3 +38,5 @@ target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_API