summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch326
1 files changed, 0 insertions, 326 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
deleted file mode 100644
index 145f2585..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
+++ /dev/null
@@ -1,326 +0,0 @@
1From 626184cf0e8c97b23cf0e7be4fb3e73f7e6748ee Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 11 Jun 2020 14:24:04 +0800
4Subject: [PATCH] cmake installation fixes
5
6Make sure that libraries/samples/binaries are installed correctly.
7
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9---
10 CMakeLists.txt | 15 --------
11 .../IEDevScriptsConfig.cmake | 2 +-
12 cmake/developer_package/packaging.cmake | 8 +++--
13 cmake/developer_package/plugins/plugins.cmake | 2 +-
14 .../common/opencv_c_wrapper/CMakeLists.txt | 2 ++
15 inference-engine/samples/CMakeLists.txt | 4 ++-
16 .../common/format_reader/CMakeLists.txt | 4 ++-
17 .../src/inference_engine/CMakeLists.txt | 35 ++-----------------
18 .../src/preprocessing/CMakeLists.txt | 2 +-
19 .../src/readers/ir_reader/CMakeLists.txt | 2 +-
20 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +-
21 .../tests/unit/cpu/CMakeLists.txt | 2 ++
22 .../unit/inference_engine/CMakeLists.txt | 2 ++
23 .../tests/unit/vpu/CMakeLists.txt | 2 ++
24 .../tools/compile_tool/CMakeLists.txt | 2 +-
25 ngraph/CMakeLists.txt | 8 ++---
26 16 files changed, 32 insertions(+), 62 deletions(-)
27
28diff --git a/CMakeLists.txt b/CMakeLists.txt
29index e0706a72e8..7920de9a42 100644
30--- a/CMakeLists.txt
31+++ b/CMakeLists.txt
32@@ -180,12 +180,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}"
33
34 # install setupvars
35
36-ie_cpack_add_component(setupvars REQUIRED)
37-
38 if(UNIX)
39- install(PROGRAMS scripts/setupvars/setupvars.sh
40- DESTINATION bin
41- COMPONENT setupvars)
42 elseif(WIN32)
43 install(PROGRAMS scripts/setupvars/setupvars.bat
44 DESTINATION bin
45@@ -195,22 +190,12 @@ endif()
46 # install install_dependencies
47
48 if(UNIX)
49- ie_cpack_add_component(install_dependencies REQUIRED)
50- install(DIRECTORY scripts/install_dependencies/
51- DESTINATION install_dependencies
52- COMPONENT install_dependencies)
53 endif()
54
55 # install files for demo
56
57-ie_cpack_add_component(demo_scripts DEPENDS core)
58
59 if(UNIX)
60- install(DIRECTORY scripts/demo/
61- DESTINATION deployment_tools/demo
62- COMPONENT demo_scripts
63- USE_SOURCE_PERMISSIONS
64- PATTERN *.bat EXCLUDE)
65 elseif(WIN32)
66 install(DIRECTORY scripts/demo/
67 DESTINATION deployment_tools/demo
68diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake
69index 0e1fe76db2..97867a24f8 100644
70--- a/cmake/developer_package/IEDevScriptsConfig.cmake
71+++ b/cmake/developer_package/IEDevScriptsConfig.cmake
72@@ -124,7 +124,7 @@ if(NOT DEFINED OUTPUT_ROOT)
73 if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR)
74 message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined")
75 endif()
76- set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
77+ set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR})
78 endif()
79
80 # Enable postfixes for Debug/Release builds
81diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake
82index 2b5e945b17..adc4bef0bc 100644
83--- a/cmake/developer_package/packaging.cmake
84+++ b/cmake/developer_package/packaging.cmake
85@@ -5,7 +5,9 @@
86 include(CPackComponent)
87 unset(IE_CPACK_COMPONENTS_ALL CACHE)
88
89-set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
90+if (NOT DEFINED IE_CPACK_IE_DIR)
91+ set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
92+endif()
93
94 #
95 # ie_cpack_set_library_dir()
96@@ -18,8 +20,8 @@ function(ie_cpack_set_library_dir)
97 set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
98 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
99 else()
100- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
101- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
102+ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
103+ set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
104 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
105 endif()
106 endfunction()
107diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake
108index aae1dbb7fb..e6dac2a478 100644
109--- a/cmake/developer_package/plugins/plugins.cmake
110+++ b/cmake/developer_package/plugins/plugins.cmake
111@@ -124,7 +124,7 @@ function(ie_add_plugin)
112
113 install(TARGETS ${IE_PLUGIN_NAME}
114 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component}
115- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component})
116+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ${install_component})
117 endif()
118 endfunction()
119
120diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt
121index 45b2b3e9ed..55f7dfd214 100644
122--- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt
123+++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt
124@@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples)
125 if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT)
126 add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
127 endif()
128+
129+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
130diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
131index ae93857944..fba24c6fed 100644
132--- a/inference-engine/samples/CMakeLists.txt
133+++ b/inference-engine/samples/CMakeLists.txt
134@@ -33,7 +33,7 @@ endif()
135
136 if(IE_MAIN_SOURCE_DIR)
137 # in case if samples are built from IE repo
138- set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR})
139+ set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR})
140 # hint for find_package(InferenceEngine in the samples folder)
141 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
142 # hint for find_package(ngraph in the samples folder)
143@@ -256,6 +256,8 @@ macro(ie_add_sample)
144 if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT)
145 add_clang_format_target(${IE_SAMPLE_NAME}_clang FOR_SOURCES ${IE_SAMPLE_SOURCES} ${IE_SAMPLE_HEADERS})
146 endif()
147+
148+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
149 endmacro()
150
151 # collect all samples subdirectories
152diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
153index d75061e56c..a2f8bd6397 100644
154--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
155+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
156@@ -44,4 +44,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}
157
158 if(COMMAND add_clang_format_target)
159 add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
160-endif()
161\ No newline at end of file
162+endif()
163+
164+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
165diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
166index 5d044e097c..103c187913 100644
167--- a/inference-engine/src/inference_engine/CMakeLists.txt
168+++ b/inference-engine/src/inference_engine/CMakeLists.txt
169@@ -227,35 +227,6 @@ list(APPEND core_components ngraph)
170 list(APPEND PATH_VARS "IE_INCLUDE_DIR" "IE_NGRAPH_DIR"
171 "IE_PARALLEL_CMAKE")
172
173-if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP})
174- ie_cpack_add_component(tbb REQUIRED)
175- list(APPEND core_components tbb)
176-
177- install(DIRECTORY "${TBB}/include"
178- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
179- COMPONENT tbb)
180- install(DIRECTORY "${TBB}/lib"
181- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
182- COMPONENT tbb)
183- if(EXISTS "${TBB}/bin")
184- install(DIRECTORY "${TBB}/bin"
185- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
186- COMPONENT tbb)
187- endif()
188- install(FILES "${TBB}/LICENSE"
189- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
190- COMPONENT tbb)
191-
192- set(IE_TBB_DIR_INSTALL "external/tbb/cmake")
193- set(IE_TBB_DIR "${TBB_DIR}")
194- list(APPEND PATH_VARS "IE_TBB_DIR")
195-
196- install(FILES "${TBB}/cmake/TBBConfig.cmake"
197- "${TBB}/cmake/TBBConfigVersion.cmake"
198- DESTINATION ${IE_CPACK_IE_DIR}/${IE_TBB_DIR_INSTALL}
199- COMPONENT tbb)
200-endif()
201-
202 # Install Inference Engine
203
204 ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
205@@ -270,7 +241,7 @@ install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets
206 LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
207
208 install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
209- DESTINATION ${IE_CPACK_RUNTIME_PATH}
210+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
211 COMPONENT core)
212
213 # Install cmake scripts
214@@ -278,7 +249,7 @@ install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
215 install(EXPORT InferenceEngineTargets
216 FILE InferenceEngineTargets.cmake
217 NAMESPACE IE::
218- DESTINATION ${IE_CPACK_IE_DIR}/share
219+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
220 COMPONENT core_dev)
221
222 set(IE_NGRAPH_DIR "${CMAKE_BINARY_DIR}/ngraph")
223@@ -307,5 +278,5 @@ configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-vers
224 install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
225 "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
226 "${InferenceEngine_SOURCE_DIR}/cmake/ie_parallel.cmake"
227- DESTINATION ${IE_CPACK_IE_DIR}/share
228+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
229 COMPONENT core_dev)
230diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt
231index f9548339d1..2670a04b60 100644
232--- a/inference-engine/src/preprocessing/CMakeLists.txt
233+++ b/inference-engine/src/preprocessing/CMakeLists.txt
234@@ -184,4 +184,4 @@ ie_developer_export_targets(${TARGET_NAME})
235
236 install(TARGETS ${TARGET_NAME}
237 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
238- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
239+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
240diff --git a/inference-engine/src/readers/ir_reader/CMakeLists.txt b/inference-engine/src/readers/ir_reader/CMakeLists.txt
241index 6d2bd39f3c..0722702055 100644
242--- a/inference-engine/src/readers/ir_reader/CMakeLists.txt
243+++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt
244@@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
245
246 install(TARGETS ${TARGET_NAME}
247 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
248- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
249+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
250diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
251index a3e0182ed9..1b0e241485 100644
252--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
253+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
254@@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
255 # install
256 if (LINUX)
257 install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
258- DESTINATION ${IE_CPACK_IE_DIR}/external
259+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
260 COMPONENT myriad)
261 endif()
262diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
263index dfa8ce9d3f..88e7fbf67f 100644
264--- a/inference-engine/tests/unit/cpu/CMakeLists.txt
265+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
266@@ -25,3 +25,5 @@ addIeTargetTest(
267 ie_faster_build(${TARGET_NAME}
268 UNITY
269 )
270+
271+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
272diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
273index 5c38c77b9b..927f93484f 100644
274--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
275+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
276@@ -26,3 +26,5 @@ addIeTargetTest(
277 LABELS
278 IE
279 )
280+
281+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
282diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt
283index fcb9f567bb..d4ac1952b8 100644
284--- a/inference-engine/tests/unit/vpu/CMakeLists.txt
285+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
286@@ -33,3 +33,5 @@ addIeTargetTest(
287 VPU
288 MYRIAD
289 )
290+
291+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
292diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt
293index 6e6f384289..a76ba55e64 100644
294--- a/inference-engine/tools/compile_tool/CMakeLists.txt
295+++ b/inference-engine/tools/compile_tool/CMakeLists.txt
296@@ -41,7 +41,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
297 ie_cpack_add_component(core_tools DEPENDS core)
298
299 install(TARGETS compile_tool
300- RUNTIME DESTINATION deployment_tools/tools/compile_tool
301+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
302 COMPONENT core_tools)
303
304 install(FILES README.md
305diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
306index 830fb3eb36..3093596e4a 100644
307--- a/ngraph/CMakeLists.txt
308+++ b/ngraph/CMakeLists.txt
309@@ -183,10 +183,10 @@ endif()
310 message(STATUS "Installation directory: ${CMAKE_INSTALL_PREFIX}")
311
312 # Destinations
313-set(NGRAPH_INSTALL_LIB "deployment_tools/ngraph/${CMAKE_INSTALL_LIBDIR}")
314-set(NGRAPH_INSTALL_INCLUDE "deployment_tools/ngraph/${CMAKE_INSTALL_INCLUDEDIR}")
315-set(NGRAPH_INSTALL_DOC "deployment_tools/ngraph/${CMAKE_INSTALL_DOCDIR}")
316-set(NGRAPH_INSTALL_BIN "deployment_tools/ngraph/${CMAKE_INSTALL_BINDIR}")
317+set(NGRAPH_INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}")
318+set(NGRAPH_INSTALL_INCLUDE "${CMAKE_INSTALL_INCLUDEDIR}")
319+set(NGRAPH_INSTALL_DOC "${CMAKE_INSTALL_DOCDIR}")
320+set(NGRAPH_INSTALL_BIN "${CMAKE_INSTALL_BINDIR}")
321
322 #-----------------------------------------------------------------------------------------------
323 # Compile Flags for nGraph...
324--
3252.32.0
326
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-05 17:07:05 +0000