summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch448
1 files changed, 448 insertions, 0 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch
new file mode 100644
index 00000000..79173ad0
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-Installation-and-build-fixes.patch
@@ -0,0 +1,448 @@
1From 295d119e12d22919fdc305470cd07973ba02f162 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Fri, 10 Apr 2020 09:29:35 +0800
4Subject: [PATCH] Installation and build fixes
5
6- Install libs, samples and binaries at appropriate places.
7- Use system installed pugixml, ade, gflags, ngraph, opencl-headers
8and icd-loader.
9- Disable usage of Werror.
10- Use find_library to look for tbb instead of looking for cmake module.
11
12Upstream-Status: Inappropriate [OS-specific]
13
14Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
15---
16 CMakeLists.txt | 2 --
17 cmake/developer_package.cmake | 8 +++++---
18 cmake/os_flags.cmake | 1 -
19 inference-engine/CMakeLists.txt | 20 +++++++++----------
20 inference-engine/cmake/ie_parallel.cmake | 10 ++--------
21 .../ie_bridges/python/CMakeLists.txt | 4 ++--
22 .../openvino/inference_engine/CMakeLists.txt | 18 +----------------
23 .../include/gpu/gpu_ocl_wrapper.hpp | 2 +-
24 inference-engine/samples/CMakeLists.txt | 6 +-----
25 .../src/cldnn_engine/CMakeLists.txt | 1 +
26 .../src/inference_engine/CMakeLists.txt | 17 +---------------
27 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +-
28 .../tests/mock_engine/CMakeLists.txt | 2 ++
29 inference-engine/tests/unit/CMakeLists.txt | 2 ++
30 inference-engine/thirdparty/CMakeLists.txt | 4 +---
31 .../clDNN/CMakeCompilerLinkerOpts.txt | 2 --
32 .../thirdparty/clDNN/CMakeLists.txt | 1 -
33 .../common/khronos_ocl_clhpp/cl2_ext.hpp | 2 +-
34 .../tools/compile_tool/CMakeLists.txt | 2 +-
35 .../tools/vpu/vpu_compile/CMakeLists.txt | 4 ++--
36 .../tools/vpu/vpu_perfcheck/CMakeLists.txt | 2 +-
37 21 files changed, 34 insertions(+), 78 deletions(-)
38
39diff --git a/CMakeLists.txt b/CMakeLists.txt
40index e48cee57..e9598455 100644
41--- a/CMakeLists.txt
42+++ b/CMakeLists.txt
43@@ -120,8 +120,6 @@ function(build_ngraph)
44 endif()
45
46 ie_cpack_add_component(ngraph)
47-
48- add_subdirectory(ngraph)
49 endfunction()
50
51 build_ngraph()
52diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
53index e59edb2b..35672cac 100644
54--- a/cmake/developer_package.cmake
55+++ b/cmake/developer_package.cmake
56@@ -5,7 +5,9 @@
57 include(CPackComponent)
58 unset(IE_CPACK_COMPONENTS_ALL CACHE)
59
60-set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
61+if (NOT DEFINED IE_CPACK_IE_DIR)
62+ set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
63+endif()
64
65 function(ie_cpack_set_library_dir)
66 string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} ARCH)
67@@ -18,7 +20,7 @@ function(ie_cpack_set_library_dir)
68 if(WIN32)
69 set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/$<CONFIG>/${ARCH} PARENT_SCOPE)
70 else()
71- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
72+ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
73 endif()
74 endfunction()
75
76@@ -99,7 +101,7 @@ if(UNIX)
77 SET(LIB_DL ${CMAKE_DL_LIBS})
78 endif()
79
80-set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
81+set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR})
82
83 # Enable postfixes for Debug/Release builds
84 set(IE_DEBUG_POSTFIX_WIN "d")
85diff --git a/cmake/os_flags.cmake b/cmake/os_flags.cmake
86index 6f70768f..40141aca 100644
87--- a/cmake/os_flags.cmake
88+++ b/cmake/os_flags.cmake
89@@ -139,7 +139,6 @@ if(WIN32)
90 else()
91 # TODO: enable for C sources as well
92 # ie_add_compiler_flags(-Werror)
93- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
94 ie_add_compiler_flags(-ffunction-sections -fdata-sections)
95 ie_add_compiler_flags(-fvisibility=hidden)
96 ie_add_compiler_flags(-fdiagnostics-show-option)
97diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
98index d5feedb4..4cf5fb3d 100644
99--- a/inference-engine/CMakeLists.txt
100+++ b/inference-engine/CMakeLists.txt
101@@ -86,13 +86,13 @@ ie_cpack_add_component(cpp_samples REQUIRED DEPENDS core)
102
103 if(UNIX)
104 install(DIRECTORY samples/
105- DESTINATION ${IE_CPACK_IE_DIR}/samples/cpp
106+ DESTINATION ${IE_CPACK_IE_DIR}/share/inference_engine/samples/
107 COMPONENT cpp_samples
108 USE_SOURCE_PERMISSIONS
109 PATTERN *.bat EXCLUDE)
110 elseif(WIN32)
111 install(DIRECTORY samples
112- DESTINATION ${IE_CPACK_IE_DIR}/samples/cpp
113+ DESTINATION ${IE_CPACK_IE_DIR}/share/inference_engine/samples/
114 COMPONENT cpp_samples
115 USE_SOURCE_PERMISSIONS
116 PATTERN *.sh EXCLUDE)
117@@ -104,30 +104,32 @@ ie_cpack_add_component(c_samples REQUIRED DEPENDS core)
118
119 if(UNIX)
120 install(PROGRAMS samples/build_samples.sh
121- DESTINATION ${IE_CPACK_IE_DIR}/samples/c
122+ DESTINATION ${IE_CPACK_IE_DIR}/share/inference_engine/samples/c
123 COMPONENT c_samples)
124 elseif(WIN32)
125 install(PROGRAMS samples/build_samples_msvc.bat
126- DESTINATION ${IE_CPACK_IE_DIR}/samples/c
127+ DESTINATION ${IE_CPACK_IE_DIR}/share/inference_engine/samples/c
128 COMPONENT c_samples)
129 endif()
130
131 install(DIRECTORY ie_bridges/c/samples/
132- DESTINATION ${IE_CPACK_IE_DIR}/samples/c
133+ DESTINATION ${IE_CPACK_IE_DIR}/share/inference_engine/samples/c
134 COMPONENT c_samples
135 PATTERN ie_bridges/c/samples/CMakeLists.txt EXCLUDE)
136
137 install(FILES samples/CMakeLists.txt
138- DESTINATION ${IE_CPACK_IE_DIR}/samples/c
139+ DESTINATION ${IE_CPACK_IE_DIR}/share/inference_engine/samples/c
140 COMPONENT c_samples)
141
142 # install Python samples
143
144+if (ENABLE_PYTHON)
145 ie_cpack_add_component(python_samples REQUIRED DEPENDS core)
146
147 install(DIRECTORY ${ie_python_api_SOURCE_DIR}/sample/
148- DESTINATION ${IE_CPACK_IE_DIR}/samples/python
149+ DESTINATION ${IE_CPACK_IE_DIR}/share/inference_engine/samples/python
150 COMPONENT python_samples)
151+endif()
152
153 # Custom target to build only Inference Engine Developer Package targets
154
155@@ -136,10 +138,6 @@ add_custom_target(ie_dev_targets ALL DEPENDS inference_engine HeteroPlugin)
156 # Developer package
157 ie_developer_export_targets(format_reader)
158
159-if (ENABLE_NGRAPH)
160- ie_developer_export_targets(${NGRAPH_LIBRARIES})
161-endif()
162-
163 export(TARGETS ${IEDeveloperPackageTargets} NAMESPACE IE::
164 APPEND FILE "${CMAKE_BINARY_DIR}/targets_developer.cmake")
165
166diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
167index 9ea885be..71733fd9 100644
168--- a/inference-engine/cmake/ie_parallel.cmake
169+++ b/inference-engine/cmake/ie_parallel.cmake
170@@ -42,14 +42,8 @@ function(set_ie_threading_interface_for TARGET_NAME)
171 set(IE_THREAD_DEFINE "IE_THREAD_SEQ")
172
173 if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
174- find_package(TBB COMPONENTS tbb tbbmalloc)
175- if (TBB_FOUND)
176- set(IE_THREAD_DEFINE "IE_THREAD_TBB")
177- ie_target_link_libraries(${TARGET_NAME} PUBLIC ${TBB_IMPORTED_TARGETS})
178- else ()
179- ext_message(WARNING "TBB was not found by the configured TBB_DIR path. \
180- SEQ method will be used for ${TARGET_NAME}")
181- endif ()
182+ set(IE_THREAD_DEFINE "IE_THREAD_TBB")
183+ target_link_libraries(${TARGET_NAME} PUBLIC tbb tbbmalloc)
184 elseif (THREADING STREQUAL "OMP")
185 if (WIN32)
186 set(omp_lib_name libiomp5md)
187diff --git a/inference-engine/ie_bridges/python/CMakeLists.txt b/inference-engine/ie_bridges/python/CMakeLists.txt
188index b9492dfe..933b3c04 100644
189--- a/inference-engine/ie_bridges/python/CMakeLists.txt
190+++ b/inference-engine/ie_bridges/python/CMakeLists.txt
191@@ -52,11 +52,11 @@ add_subdirectory (src/openvino/inference_engine)
192 ie_cpack_add_component(${PYTHON_VERSION} REQUIRED)
193
194 install(FILES requirements.txt
195- DESTINATION python/${PYTHON_VERSION}
196+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PYTHON_VERSION}/site-packages/openvino/
197 COMPONENT ${PYTHON_VERSION})
198
199 install(PROGRAMS src/openvino/__init__.py
200- DESTINATION python/${PYTHON_VERSION}/openvino
201+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PYTHON_VERSION}/site-packages/openvino/
202 COMPONENT ${PYTHON_VERSION})
203
204 ie_cpack(${PYTHON_VERSION})
205diff --git a/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt b/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
206index 72175b33..0f2425dc 100644
207--- a/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
208+++ b/inference-engine/ie_bridges/python/src/openvino/inference_engine/CMakeLists.txt
209@@ -32,20 +32,4 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
210 target_compile_options(${TARGET_NAME} PRIVATE "-Wno-error=register")
211 endif()
212
213-# perform copy
214-add_custom_command(TARGET ${TARGET_NAME}
215- POST_BUILD
216- COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/src/openvino/inference_engine/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/__init__.py
217- COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/requirements.txt ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../../requirements.txt
218- COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_BRIDGE_SRC_ROOT}/src/openvino/__init__.py ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/../__init__.py
219-)
220-
221-# install
222-
223-install(TARGETS ${TARGET_NAME}
224- DESTINATION python/${PYTHON_VERSION}/openvino/inference_engine
225- COMPONENT ${PYTHON_VERSION})
226-
227-install(PROGRAMS __init__.py
228- DESTINATION python/${PYTHON_VERSION}/openvino/inference_engine
229- COMPONENT ${PYTHON_VERSION})
230+install(DIRECTORY ${PYTHON_BRIDGE_OUTPUT_DIRECTORY} DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PYTHON_VERSION}/site-packages/)
231diff --git a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
232index fce7d8f1..827e5764 100644
233--- a/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
234+++ b/inference-engine/include/gpu/gpu_ocl_wrapper.hpp
235@@ -21,4 +21,4 @@
236 # pragma GCC system_header
237 #endif
238
239-#include <CL/cl2.hpp>
240+#include <cl2.hpp>
241diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
242index f355e7b9..351fb9cd 100644
243--- a/inference-engine/samples/CMakeLists.txt
244+++ b/inference-engine/samples/CMakeLists.txt
245@@ -24,7 +24,7 @@ endif()
246
247 if(IE_MAIN_SOURCE_DIR)
248 # in case if samples are built from IE repo
249- set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR})
250+ set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR})
251 # hint for find_package(InferenceEngine in the samples folder)
252 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
253 else()
254@@ -91,10 +91,6 @@ set (HAVE_INTTYPES_H 1)
255 set (INTTYPES_FORMAT C99)
256 set (BUILD_TESTING OFF)
257
258-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
259- add_subdirectory(thirdparty/gflags)
260-endif()
261-
262 if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
263 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
264 endif()
265diff --git a/inference-engine/src/cldnn_engine/CMakeLists.txt b/inference-engine/src/cldnn_engine/CMakeLists.txt
266index 43344e7f..50beda23 100644
267--- a/inference-engine/src/cldnn_engine/CMakeLists.txt
268+++ b/inference-engine/src/cldnn_engine/CMakeLists.txt
269@@ -32,6 +32,7 @@ target_include_directories(${TARGET_NAME} PRIVATE
270 ${CMAKE_CURRENT_SOURCE_DIR}
271 ${CLDNN__IOCL_ICD_INCDIRS}
272 ${CLDNN_TOP_FOLDER}
273+ ${CLDNN_TOP_FOLDER}/common/khronos_ocl_clhpp
274 ${IE_MAIN_SOURCE_DIR}/thirdparty/pugixml/src)
275
276 # copy default global xml file describing the custom kernels and the *.cl files
277diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
278index 54e264c8..e3809654 100644
279--- a/inference-engine/src/inference_engine/CMakeLists.txt
280+++ b/inference-engine/src/inference_engine/CMakeLists.txt
281@@ -292,20 +292,6 @@ if(threading_tbb)
282 ie_cpack_add_component(tbb REQUIRED)
283 list(APPEND core_components tbb)
284
285- install(DIRECTORY "${TBB}/include"
286- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
287- COMPONENT tbb)
288- install(DIRECTORY "${TBB}/lib"
289- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
290- COMPONENT tbb)
291- if(EXISTS "${TBB}/bin")
292- install(DIRECTORY "${TBB}/bin"
293- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
294- COMPONENT tbb)
295- endif()
296- install(FILES "${TBB}/LICENSE"
297- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
298- COMPONENT tbb)
299 endif()
300
301 ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
302@@ -318,10 +304,9 @@ install(TARGETS ${TARGET_NAME} ${TARGET_NAME}_nn_builder
303 LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH}
304 COMPONENT core)
305 install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
306- "${OpenVINO_BINARY_DIR}/share/ie_rh_decoder.cmake"
307 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
308 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
309- DESTINATION ${IE_CPACK_IE_DIR}/share
310+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
311 COMPONENT core)
312 install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
313 DESTINATION ${IE_CPACK_LIBRARY_PATH}
314diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
315index 32cb534a..858ffefc 100644
316--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
317+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
318@@ -41,5 +41,5 @@ target_link_libraries(${TARGET_NAME}
319 # install
320
321 install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
322- DESTINATION deployment_tools/inference_engine/external
323+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
324 COMPONENT myriad)
325diff --git a/inference-engine/tests/mock_engine/CMakeLists.txt b/inference-engine/tests/mock_engine/CMakeLists.txt
326index f3fb53e1..09fb66ce 100644
327--- a/inference-engine/tests/mock_engine/CMakeLists.txt
328+++ b/inference-engine/tests/mock_engine/CMakeLists.txt
329@@ -38,3 +38,5 @@ target_compile_definitions(${TARGET_NAME} PRIVATE IMPLEMENT_INFERENCE_ENGINE_PLU
330 set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD 11)
331 set_property(TARGET ${TARGET_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
332 set_property(TARGET ${TARGET_NAME} PROPERTY COMPILE_PDB_NAME ${TARGET_NAME})
333+
334+install(TARGETS ${TARGET_NAME} EXPORT ${TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
335diff --git a/inference-engine/tests/unit/CMakeLists.txt b/inference-engine/tests/unit/CMakeLists.txt
336index a5c945ae..eabe70d3 100644
337--- a/inference-engine/tests/unit/CMakeLists.txt
338+++ b/inference-engine/tests/unit/CMakeLists.txt
339@@ -187,3 +187,5 @@ add_test(NAME ${TARGET_NAME}
340 COMMAND ${TARGET_NAME})
341
342 add_dependencies(${TARGET_NAME} mock_engine)
343+
344+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
345diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
346index ec22761d..3962d924 100644
347--- a/inference-engine/thirdparty/CMakeLists.txt
348+++ b/inference-engine/thirdparty/CMakeLists.txt
349@@ -35,14 +35,12 @@ function(build_with_lto)
350 add_subdirectory(clDNN)
351 endif()
352
353- add_subdirectory(pugixml)
354 add_subdirectory(stb_lib)
355- add_subdirectory(ade)
356 add_subdirectory(fluid/modules/gapi)
357
358 # developer package
359
360- ie_developer_export_targets(ade fluid pugixml)
361+ ie_developer_export_targets(fluid)
362 if(TARGET pugixml_mt)
363 ie_developer_export_targets(pugixml_mt)
364 endif()
365diff --git a/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt b/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt
366index 6b799cdd..91755b35 100644
367--- a/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt
368+++ b/inference-engine/thirdparty/clDNN/CMakeCompilerLinkerOpts.txt
369@@ -206,7 +206,6 @@ elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
370 ALIAS RttiDisabled "-fno-rtti"
371 ALIAS RttiEnabled "-frtti"
372 ALIAS TreatWarnAsErrorDisabled TreatWarnAsError REMOVE_GROUP
373- ALIAS TreatWarnAsErrorEnabled "-Werror" "-pedantic-errors"
374 ALIAS WarnLevel0 "-w"
375 ALIAS WarnLevel1 WarnLevels REMOVE_GROUP
376 ALIAS WarnLevel2 "-Wall"
377@@ -290,7 +289,6 @@ elseif((CMAKE_C_COMPILER_ID MATCHES "^Clang$") OR (CMAKE_CXX_COMPILER_ID MATCHES
378 ALIAS RttiDisabled "-fno-rtti"
379 ALIAS RttiEnabled Rtti REMOVE_GROUP
380 ALIAS TreatWarnAsErrorDisabled TreatWarnAsError REMOVE_GROUP
381- ALIAS TreatWarnAsErrorEnabled "-Werror"
382 ALIAS WarnLevel0 "-w"
383 ALIAS WarnLevel1 WarnLevels REMOVE_GROUP
384 ALIAS WarnLevel2 "-Wall"
385diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
386index b08c2744..42ca79e6 100644
387--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
388+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
389@@ -767,7 +767,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
390 MultiProcessorCompilation
391 DeadCodeEliminate
392 ExtensionsEnabled
393- TreatWarnAsErrorEnabled
394 WarnLevel4
395 NoFastMath
396 StackProtector
397diff --git a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
398index a9e379bd..8b822223 100644
399--- a/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
400+++ b/inference-engine/thirdparty/clDNN/common/khronos_ocl_clhpp/cl2_ext.hpp
401@@ -30,7 +30,7 @@ typedef cl_d3d11_device_set_khr cl_device_set_intel;
402 typedef cl_va_api_device_source_intel cl_device_source_intel;
403 typedef cl_va_api_device_set_intel cl_device_set_intel;
404 #endif
405-#include <CL/cl_intel_planar_yuv.h>
406+#include <CL/cl_ext_intel.h>
407
408 namespace cl {
409 typedef CL_API_ENTRY cl_int(CL_API_CALL *PFN_clEnqueueAcquireMediaSurfacesINTEL)(
410diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt
411index 25168bac..1c57116f 100644
412--- a/inference-engine/tools/compile_tool/CMakeLists.txt
413+++ b/inference-engine/tools/compile_tool/CMakeLists.txt
414@@ -48,5 +48,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
415 # install
416
417 install(TARGETS compile_tool
418- RUNTIME DESTINATION ${IE_CPACK_LIBRARY_PATH}
419+ RUNTIME DESTINATION bin
420 COMPONENT core)
421diff --git a/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt b/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
422index 4123de6f..52179fac 100644
423--- a/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
424+++ b/inference-engine/tools/vpu/vpu_compile/CMakeLists.txt
425@@ -50,5 +50,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
426 # install
427
428 install(TARGETS ${TARGET_NAME}
429- RUNTIME DESTINATION ${IE_CPACK_LIBRARY_PATH}
430- COMPONENT myriad)
431\ No newline at end of file
432+ RUNTIME DESTINATION bin
433+ COMPONENT myriad)
434diff --git a/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt b/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
435index a7a801d4..b8f9e26f 100644
436--- a/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
437+++ b/inference-engine/tools/vpu/vpu_perfcheck/CMakeLists.txt
438@@ -55,6 +55,6 @@ if(ENABLE_MYRIAD)
439 add_perfcheck_target(myriad_perfcheck myriadPlugin)
440
441 install(TARGETS myriad_perfcheck
442- RUNTIME DESTINATION ${IE_CPACK_LIBRARY_PATH}
443+ RUNTIME DESTINATION bin
444 COMPONENT myriad)
445 endif()
446--
4472.25.2
448
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-03 18:14:38 +0000