diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files')
6 files changed, 164 insertions, 663 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch new file mode 100644 index 00000000..7f5b46c6 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-cmake-yocto-specific-tweaks-to-the-build-process.patch | |||
@@ -0,0 +1,86 @@ | |||
1 | From e4edbdae9a2dbfec6fd0706bdfff8abdfe3363fc Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 29 Nov 2023 12:42:57 +0530 | ||
4 | Subject: [PATCH] cmake: yocto specific tweaks to the build process | ||
5 | |||
6 | * Dont try to detect glibc version as that doesn't work when cross compiling. | ||
7 | * Dont try to detect CXX11_ABI | ||
8 | * Install sample binaries as well. | ||
9 | * Dont try to write triggers for CPack. We package ourselves. | ||
10 | * Fix the installation path for Python modules when baselib = lib64. | ||
11 | |||
12 | Upstream-Status: Inappropriate | ||
13 | |||
14 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
15 | --- | ||
16 | cmake/developer_package/packaging/rpm/rpm.cmake | 2 +- | ||
17 | cmake/developer_package/target_flags.cmake | 4 ++-- | ||
18 | samples/cpp/CMakeLists.txt | 6 +++--- | ||
19 | src/bindings/python/CMakeLists.txt | 2 +- | ||
20 | 4 files changed, 7 insertions(+), 7 deletions(-) | ||
21 | |||
22 | diff --git a/cmake/developer_package/packaging/rpm/rpm.cmake b/cmake/developer_package/packaging/rpm/rpm.cmake | ||
23 | index 99f11730983..1a1f61fcd3d 100644 | ||
24 | --- a/cmake/developer_package/packaging/rpm/rpm.cmake | ||
25 | +++ b/cmake/developer_package/packaging/rpm/rpm.cmake | ||
26 | @@ -156,7 +156,7 @@ ov_rpm_specific_settings() | ||
27 | # needed to add triggers for packages with libraries | ||
28 | set(def_triggers "${OpenVINO_BINARY_DIR}/_CPack_Packages/triggers") | ||
29 | set(triggers_content "# /bin/sh -p\n/sbin/ldconfig\n") | ||
30 | -file(WRITE "${def_triggers}" "${triggers_content}") | ||
31 | +#file(WRITE "${def_triggers}" "${triggers_content}") | ||
32 | |||
33 | # | ||
34 | # Functions helpful for packaging your modules with RPM cpack | ||
35 | diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake | ||
36 | index d047a1aebd9..4e8ca68c60f 100644 | ||
37 | --- a/cmake/developer_package/target_flags.cmake | ||
38 | +++ b/cmake/developer_package/target_flags.cmake | ||
39 | @@ -149,7 +149,7 @@ function(ov_glibc_version) | ||
40 | endif() | ||
41 | endfunction() | ||
42 | |||
43 | -ov_glibc_version() | ||
44 | +#ov_glibc_version() | ||
45 | |||
46 | # | ||
47 | # Detects default value for _GLIBCXX_USE_CXX11_ABI for current compiler | ||
48 | @@ -160,4 +160,4 @@ macro(ov_get_glibcxx_use_cxx11_abi) | ||
49 | endif() | ||
50 | endmacro() | ||
51 | |||
52 | -ov_get_glibcxx_use_cxx11_abi() | ||
53 | +#ov_get_glibcxx_use_cxx11_abi() | ||
54 | diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt | ||
55 | index 4d33bff944e..3e7f1458578 100644 | ||
56 | --- a/samples/cpp/CMakeLists.txt | ||
57 | +++ b/samples/cpp/CMakeLists.txt | ||
58 | @@ -206,9 +206,9 @@ macro(ov_add_sample) | ||
59 | target_link_libraries(${SAMPLE_NAME} PRIVATE ${ov_link_libraries} Threads::Threads ${SAMPLE_DEPENDENCIES}) | ||
60 | |||
61 | install(TARGETS ${SAMPLE_NAME} | ||
62 | - RUNTIME DESTINATION samples_bin/ | ||
63 | - COMPONENT samples_bin | ||
64 | - EXCLUDE_FROM_ALL) | ||
65 | + DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
66 | + COMPONENT samples_bin) | ||
67 | + | ||
68 | |||
69 | # create global target with all samples / demo apps | ||
70 | if(NOT TARGET ov_samples) | ||
71 | diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt | ||
72 | index 6cf43ec3fed..d539b9d003f 100644 | ||
73 | --- a/src/bindings/python/CMakeLists.txt | ||
74 | +++ b/src/bindings/python/CMakeLists.txt | ||
75 | @@ -320,7 +320,7 @@ if(ENABLE_PYTHON_PACKAGING) | ||
76 | # install OpenVINO Python API | ||
77 | |||
78 | set(python_package_prefix "${CMAKE_CURRENT_BINARY_DIR}/install_${pyversion}") | ||
79 | - set(install_lib "${python_package_prefix}/lib/${python_versioned_folder}/${ov_site_packages}") | ||
80 | + set(install_lib "${python_package_prefix}/${CMAKE_INSTALL_LIBDIR}/${python_versioned_folder}/${ov_site_packages}") | ||
81 | set(openvino_meta_info_subdir "openvino-${OpenVINO_VERSION}-py${python_xy}.egg-info") | ||
82 | set(openvino_meta_info_file "${install_lib}/${openvino_meta_info_subdir}/PKG-INFO") | ||
83 | |||
84 | -- | ||
85 | 2.34.1 | ||
86 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch deleted file mode 100644 index 315385d8..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch +++ /dev/null | |||
@@ -1,296 +0,0 @@ | |||
1 | From b0f30ab7ecdac98afa72a31371a393a73f855b3c Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Thu, 7 Apr 2022 21:39:26 +0800 | ||
4 | Subject: [PATCH] Use system installed dependencies | ||
5 | |||
6 | Use the system versions of libva, tbb, OpenCV, ade and zlib. | ||
7 | |||
8 | Upstream-Status: Inappropriate | ||
9 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
10 | |||
11 | --- | ||
12 | cmake/dependencies.cmake | 75 ------------------------- | ||
13 | cmake/extra_modules.cmake | 4 +- | ||
14 | cmake/templates/OpenVINOConfig.cmake.in | 9 --- | ||
15 | src/cmake/ie_parallel.cmake | 2 +- | ||
16 | src/plugins/intel_gpu/include/va/va.h | 6 -- | ||
17 | tests/fuzz/src/CMakeLists.txt | 3 +- | ||
18 | thirdparty/CMakeLists.txt | 26 ++++----- | ||
19 | thirdparty/cnpy/CMakeLists.txt | 2 +- | ||
20 | 8 files changed, 15 insertions(+), 112 deletions(-) | ||
21 | delete mode 100644 src/plugins/intel_gpu/include/va/va.h | ||
22 | |||
23 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake | ||
24 | index e2f941fcd..1fcc358ef 100644 | ||
25 | --- a/cmake/dependencies.cmake | ||
26 | +++ b/cmake/dependencies.cmake | ||
27 | @@ -29,26 +29,6 @@ endif() | ||
28 | |||
29 | if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") | ||
30 | set(protoc_version "3.18.2") | ||
31 | - | ||
32 | - RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT | ||
33 | - ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" | ||
34 | - TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64" | ||
35 | - SHA256 "42fde2b6044c1f74c7e86d4e03b43aac87128ddf57ac6ed8c4eab7a1e21bbf21" | ||
36 | - ) | ||
37 | - debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) | ||
38 | - | ||
39 | - reset_deps_cache(SYSTEM_PROTOC) | ||
40 | - | ||
41 | - find_host_program( | ||
42 | - SYSTEM_PROTOC | ||
43 | - NAMES protoc | ||
44 | - PATHS "${SYSTEM_PROTOC_ROOT}/bin" | ||
45 | - NO_DEFAULT_PATH) | ||
46 | - if(NOT SYSTEM_PROTOC) | ||
47 | - message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary") | ||
48 | - endif() | ||
49 | - | ||
50 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") | ||
51 | endif() | ||
52 | |||
53 | if(ENABLE_INTEL_MYRIAD) | ||
54 | @@ -102,61 +82,6 @@ if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | ||
55 | set(IE_PATH_TO_DEPS "${THIRDPARTY_SERVER_PATH}") | ||
56 | endif() | ||
57 | |||
58 | - if(WIN32 AND X86_64) | ||
59 | - # TODO: add target_path to be platform specific as well, to avoid following if | ||
60 | - RESOLVE_DEPENDENCY(TBB | ||
61 | - ARCHIVE_WIN "tbb2020_20200415_win.zip" | ||
62 | - TARGET_PATH "${TEMP}/tbb" | ||
63 | - ENVIRONMENT "TBBROOT" | ||
64 | - SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479") | ||
65 | - if(ENABLE_TBBBIND_2_5) | ||
66 | - RESOLVE_DEPENDENCY(TBBBIND_2_5 | ||
67 | - ARCHIVE_WIN "tbbbind_2_5_static_win_v1.zip" | ||
68 | - TARGET_PATH "${TEMP}/tbbbind_2_5" | ||
69 | - ENVIRONMENT "TBBBIND_2_5_ROOT" | ||
70 | - SHA256 "a67afeea8cf194f97968c800dab5b5459972908295242e282045d6b8953573c1") | ||
71 | - else() | ||
72 | - message(WARNING "prebuilt TBBBIND_2_5 is not available. | ||
73 | - Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake configure") | ||
74 | - endif() | ||
75 | - elseif(ANDROID) # Should be before LINUX due LINUX is detected as well | ||
76 | - RESOLVE_DEPENDENCY(TBB | ||
77 | - ARCHIVE_ANDROID "tbb2020_20200404_android.tgz" | ||
78 | - TARGET_PATH "${TEMP}/tbb" | ||
79 | - ENVIRONMENT "TBBROOT" | ||
80 | - SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce") | ||
81 | - elseif(LINUX AND X86_64) | ||
82 | - RESOLVE_DEPENDENCY(TBB | ||
83 | - ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz" | ||
84 | - TARGET_PATH "${TEMP}/tbb" | ||
85 | - ENVIRONMENT "TBBROOT" | ||
86 | - SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008") | ||
87 | - if(ENABLE_TBBBIND_2_5) | ||
88 | - RESOLVE_DEPENDENCY(TBBBIND_2_5 | ||
89 | - ARCHIVE_LIN "tbbbind_2_5_static_lin_v2.tgz" | ||
90 | - TARGET_PATH "${TEMP}/tbbbind_2_5" | ||
91 | - ENVIRONMENT "TBBBIND_2_5_ROOT" | ||
92 | - SHA256 "865e7894c58402233caf0d1b288056e0e6ab2bf7c9d00c9dc60561c484bc90f4") | ||
93 | - else() | ||
94 | - message(WARNING "prebuilt TBBBIND_2_5 is not available. | ||
95 | - Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake configure") | ||
96 | - endif() | ||
97 | - elseif(LINUX AND AARCH64) | ||
98 | - RESOLVE_DEPENDENCY(TBB | ||
99 | - ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz" | ||
100 | - TARGET_PATH "${TEMP}/tbb_yocto" | ||
101 | - ENVIRONMENT "TBBROOT" | ||
102 | - SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b") | ||
103 | - elseif(APPLE AND X86_64) | ||
104 | - RESOLVE_DEPENDENCY(TBB | ||
105 | - ARCHIVE_MAC "tbb2020_20200404_mac.tgz" | ||
106 | - TARGET_PATH "${TEMP}/tbb" | ||
107 | - ENVIRONMENT "TBBROOT" | ||
108 | - SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6") | ||
109 | - else() | ||
110 | - message(FATAL_ERROR "TBB is not available on current platform") | ||
111 | - endif() | ||
112 | - | ||
113 | update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder") | ||
114 | if(EXISTS "${TBBROOT}/lib/cmake/TBB/TBBConfig.cmake") | ||
115 | # oneTBB case | ||
116 | diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake | ||
117 | index e33e4378f..f0cacdf6f 100644 | ||
118 | --- a/cmake/extra_modules.cmake | ||
119 | +++ b/cmake/extra_modules.cmake | ||
120 | @@ -18,7 +18,7 @@ function(ie_generate_dev_package_config) | ||
121 | configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in" | ||
122 | "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake" | ||
123 | INSTALL_DESTINATION share # not used | ||
124 | - PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR" | ||
125 | + PATH_VARS "OpenVINO_SOURCE_DIR" | ||
126 | NO_CHECK_REQUIRED_COMPONENTS_MACRO) | ||
127 | |||
128 | configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in" | ||
129 | @@ -45,7 +45,7 @@ function(ov_generate_dev_package_config) | ||
130 | configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in" | ||
131 | "${CMAKE_BINARY_DIR}/OpenVINODeveloperPackageConfig.cmake" | ||
132 | INSTALL_DESTINATION share # not used | ||
133 | - PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR" | ||
134 | + PATH_VARS "OpenVINO_SOURCE_DIR" | ||
135 | NO_CHECK_REQUIRED_COMPONENTS_MACRO) | ||
136 | |||
137 | configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cmake.in" | ||
138 | diff --git a/cmake/templates/OpenVINOConfig.cmake.in b/cmake/templates/OpenVINOConfig.cmake.in | ||
139 | index 00e892f2b..7c686fa07 100644 | ||
140 | --- a/cmake/templates/OpenVINOConfig.cmake.in | ||
141 | +++ b/cmake/templates/OpenVINOConfig.cmake.in | ||
142 | @@ -146,15 +146,6 @@ set(_ov_package_prefix_dir "${PACKAGE_PREFIX_DIR}") | ||
143 | |||
144 | set(THREADING "@THREADING@") | ||
145 | if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND NOT TBB_FOUND) | ||
146 | - set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@") | ||
147 | - _ov_find_dependency(TBB | ||
148 | - COMPONENTS tbb tbbmalloc | ||
149 | - CONFIG | ||
150 | - PATHS ${TBBROOT}/cmake | ||
151 | - ${_tbb_dir} | ||
152 | - NO_CMAKE_FIND_ROOT_PATH | ||
153 | - NO_DEFAULT_PATH) | ||
154 | - | ||
155 | set(install_tbbbind "@install_tbbbind@") | ||
156 | if(install_tbbbind) | ||
157 | set_and_check(_tbb_bind_dir "@PACKAGE_IE_TBBBIND_DIR@") | ||
158 | diff --git a/src/cmake/ie_parallel.cmake b/src/cmake/ie_parallel.cmake | ||
159 | index a036b019c..031f1ea48 100644 | ||
160 | --- a/src/cmake/ie_parallel.cmake | ||
161 | +++ b/src/cmake/ie_parallel.cmake | ||
162 | @@ -34,7 +34,7 @@ function(set_ie_threading_interface_for TARGET_NAME) | ||
163 | endforeach() | ||
164 | endif() | ||
165 | set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE) | ||
166 | - set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) | ||
167 | + set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE) | ||
168 | set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE) | ||
169 | if (NOT TBB_FOUND) | ||
170 | set(THREADING "SEQ" PARENT_SCOPE) | ||
171 | diff --git a/src/plugins/intel_gpu/include/va/va.h b/src/plugins/intel_gpu/include/va/va.h | ||
172 | deleted file mode 100644 | ||
173 | index 5c8a5c6f6..000000000 | ||
174 | --- a/src/plugins/intel_gpu/include/va/va.h | ||
175 | +++ /dev/null | ||
176 | @@ -1,6 +0,0 @@ | ||
177 | -// Copyright (C) 2018-2022 Intel Corporation | ||
178 | -// SPDX-License-Identifier: Apache-2.0 | ||
179 | -// | ||
180 | - | ||
181 | -typedef cl_uint VASurfaceID; | ||
182 | -typedef void* VADisplay; | ||
183 | diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt | ||
184 | index 5e6b7b168..a81c51bb7 100644 | ||
185 | --- a/tests/fuzz/src/CMakeLists.txt | ||
186 | +++ b/tests/fuzz/src/CMakeLists.txt | ||
187 | @@ -10,14 +10,13 @@ add_custom_target(fuzz) | ||
188 | FILE(GLOB tests "*-fuzzer.cc") | ||
189 | |||
190 | add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy) | ||
191 | -add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib) | ||
192 | |||
193 | foreach(test_source ${tests}) | ||
194 | get_filename_component(test_name ${test_source} NAME_WE) | ||
195 | add_fuzzer(${test_name} ${test_source}) | ||
196 | |||
197 | target_link_libraries(${test_name} PRIVATE | ||
198 | - openvino::runtime cnpy zlib) | ||
199 | + openvino::runtime cnpy z) | ||
200 | |||
201 | add_dependencies(fuzz ${test_name}) | ||
202 | |||
203 | diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt | ||
204 | index 2d61c5fd7..97b372998 100644 | ||
205 | --- a/thirdparty/CMakeLists.txt | ||
206 | +++ b/thirdparty/CMakeLists.txt | ||
207 | @@ -12,10 +12,9 @@ endif() | ||
208 | |||
209 | add_subdirectory(ittapi) | ||
210 | add_subdirectory(itt_collector EXCLUDE_FROM_ALL) | ||
211 | -add_subdirectory(zlib EXCLUDE_FROM_ALL) | ||
212 | add_subdirectory(cnpy EXCLUDE_FROM_ALL) | ||
213 | if(ENABLE_INTEL_GPU) | ||
214 | - add_subdirectory(ocl) | ||
215 | + #add_subdirectory(ocl) | ||
216 | endif() | ||
217 | |||
218 | add_subdirectory(xbyak EXCLUDE_FROM_ALL) | ||
219 | @@ -52,21 +51,16 @@ endif() | ||
220 | add_library(ocv_hal INTERFACE) | ||
221 | target_include_directories(ocv_hal INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ocv") | ||
222 | |||
223 | -add_subdirectory(ade EXCLUDE_FROM_ALL) | ||
224 | add_subdirectory(fluid/modules/gapi EXCLUDE_FROM_ALL) | ||
225 | -set_target_properties(ade fluid PROPERTIES FOLDER thirdparty) | ||
226 | -openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid) | ||
227 | +set_target_properties(fluid PROPERTIES FOLDER thirdparty) | ||
228 | +openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid) | ||
229 | |||
230 | -ov_install_static_lib(ade openvino_common) | ||
231 | ov_install_static_lib(fluid openvino_common) | ||
232 | |||
233 | # | ||
234 | # Gflags | ||
235 | # | ||
236 | |||
237 | -add_subdirectory(gflags EXCLUDE_FROM_ALL) | ||
238 | -openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags) | ||
239 | - | ||
240 | # | ||
241 | # Google Tests framework | ||
242 | # | ||
243 | @@ -89,13 +83,13 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND | ||
244 | set(Protobuf_DEBUG ON) | ||
245 | endif() | ||
246 | find_package(Protobuf 3.18.2 REQUIRED) | ||
247 | - set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite) | ||
248 | - set(Protobuf_LIBRARIES protobuf::libprotobuf) | ||
249 | - set(SYSTEM_PROTOC protobuf::protoc) | ||
250 | + set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite) | ||
251 | + set(Protobuf_LIBRARIES protobuf::libprotobuf) | ||
252 | + #set(SYSTEM_PROTOC protobuf::protoc) | ||
253 | set(PROTOC_EXECUTABLE ${SYSTEM_PROTOC}) | ||
254 | |||
255 | foreach(target ${SYSTEM_PROTOC} ${Protobuf_LIBRARIES} ${Protobuf_LITE_LIBRARIES}) | ||
256 | - set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE) | ||
257 | + #set_property(TARGET ${target} PROPERTY IMPORTED_GLOBAL TRUE) | ||
258 | endforeach() | ||
259 | else() | ||
260 | add_subdirectory(protobuf EXCLUDE_FROM_ALL) | ||
261 | @@ -104,8 +98,8 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND | ||
262 | # forward variables used in the other places | ||
263 | set(SYSTEM_PROTOC ${SYSTEM_PROTOC} PARENT_SCOPE) | ||
264 | set(PROTOC_EXECUTABLE ${PROTOC_EXECUTABLE} PARENT_SCOPE) | ||
265 | - set(Protobuf_LIBRARIES ${Protobuf_LIBRARIES} PARENT_SCOPE) | ||
266 | - set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARIES} PARENT_SCOPE) | ||
267 | + set(Protobuf_LIBRARIES ${Protobuf_LIBRARY} PARENT_SCOPE) | ||
268 | + set(Protobuf_LITE_LIBRARIES ${Protobuf_LITE_LIBRARY} PARENT_SCOPE) | ||
269 | set(Protobuf_INCLUDE_DIRS ${Protobuf_INCLUDE_DIRS} PARENT_SCOPE) | ||
270 | set(Protobuf_IN_FRONTEND ON PARENT_SCOPE) | ||
271 | |||
272 | @@ -116,7 +110,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND | ||
273 | set(link_type INTERFACE) | ||
274 | endif() | ||
275 | if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG) | ||
276 | - target_compile_options(${target} ${link_type} -Wno-undef) | ||
277 | + #target_compile_options(${target} ${link_type} -Wno-undef) | ||
278 | endif() | ||
279 | endforeach() | ||
280 | endif() | ||
281 | diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt | ||
282 | index 041031e92..793de9845 100644 | ||
283 | --- a/thirdparty/cnpy/CMakeLists.txt | ||
284 | +++ b/thirdparty/cnpy/CMakeLists.txt | ||
285 | @@ -13,7 +13,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$") | ||
286 | PRIVATE -Wno-all) | ||
287 | endif() | ||
288 | |||
289 | -target_link_libraries(${TARGET_NAME} PUBLIC zlib) | ||
290 | +target_link_libraries(${TARGET_NAME} PUBLIC z) | ||
291 | target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") | ||
292 | |||
293 | set_target_properties(${TARGET_NAME} PROPERTIES FOLDER thirdparty) | ||
294 | -- | ||
295 | 2.35.1 | ||
296 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch new file mode 100644 index 00000000..8a1464d5 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cmake-Fix-overloaded-virtual-error.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 4a909a03b6dd336e7ea76e3f44d7cfb5d7e44798 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 29 Nov 2023 12:49:35 +0530 | ||
4 | Subject: [PATCH 2/3] cmake: Fix overloaded-virtual error | ||
5 | |||
6 | * Remove -Werror for: | ||
7 | |git/src/plugins/intel_gpu/src/kernel_selector/jitter.h:129:28: error: 'virtual kernel_selector::JitDefinitions kernel_selector::JitConstant::GetDefinitions() const' was hidden [-Werror=overloaded-virtual=] | ||
8 | | 129 | virtual JitDefinitions GetDefinitions() const = 0; | ||
9 | | | | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
14 | --- | ||
15 | src/plugins/intel_gpu/CMakeLists.txt | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt | ||
19 | index 2f3d9127dde..2fd4f5c1b3c 100644 | ||
20 | --- a/src/plugins/intel_gpu/CMakeLists.txt | ||
21 | +++ b/src/plugins/intel_gpu/CMakeLists.txt | ||
22 | @@ -47,7 +47,7 @@ add_subdirectory(thirdparty) | ||
23 | include(thirdparty/cmake/rapidjson.cmake) | ||
24 | |||
25 | if(CMAKE_COMPILER_IS_GNUCXX) | ||
26 | - ov_add_compiler_flags(-Werror) | ||
27 | + #ov_add_compiler_flags(-Werror) | ||
28 | endif() | ||
29 | |||
30 | add_subdirectory(src/runtime) | ||
31 | -- | ||
32 | 2.34.1 | ||
33 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch deleted file mode 100644 index 9e2b46fd..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-inference-engine-installation-fixes.patch +++ /dev/null | |||
@@ -1,348 +0,0 @@ | |||
1 | From 07772636ef9b7207967395d22a869e204e8f485b Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Mon, 11 Apr 2022 11:11:23 +0800 | ||
4 | Subject: [PATCH] Fix installation of binaries and libraries | ||
5 | |||
6 | Make sure binaries are installed correctly. | ||
7 | |||
8 | Upstream-Status: Inappropriate | ||
9 | |||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
11 | --- | ||
12 | CMakeLists.txt | 2 +- | ||
13 | cmake/developer_package/frontends/frontends.cmake | 2 +- | ||
14 | cmake/developer_package/packaging.cmake | 4 ++-- | ||
15 | cmake/developer_package/plugins/plugins.cmake | 2 +- | ||
16 | docs/CMakeLists.txt | 3 ++- | ||
17 | samples/CMakeLists.txt | 2 +- | ||
18 | samples/c/common/opencv_c_wrapper/CMakeLists.txt | 2 ++ | ||
19 | samples/cpp/CMakeLists.txt | 2 ++ | ||
20 | scripts/CMakeLists.txt | 10 +++++----- | ||
21 | src/bindings/c/src/CMakeLists.txt | 4 ++-- | ||
22 | src/cmake/openvino.cmake | 12 ++++++------ | ||
23 | src/common/preprocessing/CMakeLists.txt | 2 +- | ||
24 | src/core/CMakeLists.txt | 4 ++-- | ||
25 | src/inference/CMakeLists.txt | 2 +- | ||
26 | .../intel_gpu/src/kernel_selector/CMakeLists.txt | 2 +- | ||
27 | src/plugins/intel_myriad/myriad_dependencies.cmake | 2 +- | ||
28 | .../intel_myriad/myriad_plugin/CMakeLists.txt | 2 +- | ||
29 | tools/CMakeLists.txt | 2 +- | ||
30 | tools/compile_tool/CMakeLists.txt | 8 ++++---- | ||
31 | 19 files changed, 37 insertions(+), 32 deletions(-) | ||
32 | |||
33 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
34 | index fe62c6318..344d9398f 100644 | ||
35 | --- a/CMakeLists.txt | ||
36 | +++ b/CMakeLists.txt | ||
37 | @@ -104,7 +104,7 @@ include(cmake/extra_modules.cmake) | ||
38 | add_subdirectory(docs) | ||
39 | add_subdirectory(tools) | ||
40 | add_subdirectory(scripts) | ||
41 | -add_subdirectory(licensing) | ||
42 | +#add_subdirectory(licensing) | ||
43 | |||
44 | # | ||
45 | # CPack | ||
46 | diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake | ||
47 | index 39b23fe65..aa638c077 100644 | ||
48 | --- a/cmake/developer_package/frontends/frontends.cmake | ||
49 | +++ b/cmake/developer_package/frontends/frontends.cmake | ||
50 | @@ -2,7 +2,7 @@ | ||
51 | # SPDX-License-Identifier: Apache-2.0 | ||
52 | # | ||
53 | |||
54 | -set(FRONTEND_INSTALL_INCLUDE "runtime/include/") | ||
55 | +set(FRONTEND_INSTALL_INCLUDE "include/") | ||
56 | set(FRONTEND_NAME_PREFIX "openvino_") | ||
57 | set(FRONTEND_NAME_SUFFIX "_frontend") | ||
58 | |||
59 | diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake | ||
60 | index cc287ff1f..2daee6611 100644 | ||
61 | --- a/cmake/developer_package/packaging.cmake | ||
62 | +++ b/cmake/developer_package/packaging.cmake | ||
63 | @@ -20,8 +20,8 @@ function(ie_cpack_set_library_dir) | ||
64 | set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE) | ||
65 | set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE) | ||
66 | else() | ||
67 | - set(IE_CPACK_LIBRARY_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
68 | - set(IE_CPACK_RUNTIME_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
69 | + set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE) | ||
70 | + set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE) | ||
71 | set(IE_CPACK_ARCHIVE_PATH runtime/lib/${ARCH_FOLDER} PARENT_SCOPE) | ||
72 | endif() | ||
73 | endfunction() | ||
74 | diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake | ||
75 | index a630d6c35..779c43631 100644 | ||
76 | --- a/cmake/developer_package/plugins/plugins.cmake | ||
77 | +++ b/cmake/developer_package/plugins/plugins.cmake | ||
78 | @@ -138,7 +138,7 @@ function(ie_add_plugin) | ||
79 | |||
80 | if(BUILD_SHARED_LIBS) | ||
81 | install(TARGETS ${IE_PLUGIN_NAME} | ||
82 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
83 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} | ||
84 | COMPONENT ${install_component}) | ||
85 | else() | ||
86 | ov_install_static_lib(${IE_PLUGIN_NAME} ${install_component}) | ||
87 | diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt | ||
88 | index 86b0e8652..4f31d3cc4 100644 | ||
89 | --- a/docs/CMakeLists.txt | ||
90 | +++ b/docs/CMakeLists.txt | ||
91 | @@ -36,9 +36,10 @@ if(NOT ENABLE_DOCKER) | ||
92 | foreach(target openvino_template_plugin template_extension openvino_template_extension) | ||
93 | if(TARGET ${target}) | ||
94 | install(TARGETS ${target} | ||
95 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
96 | + LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
97 | COMPONENT tests | ||
98 | EXCLUDE_FROM_ALL) | ||
99 | + install(TARGETS ${target} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
100 | endif() | ||
101 | endforeach() | ||
102 | endif() | ||
103 | diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt | ||
104 | index 8101b5e32..6abe8c20c 100644 | ||
105 | --- a/samples/CMakeLists.txt | ||
106 | +++ b/samples/CMakeLists.txt | ||
107 | @@ -9,7 +9,7 @@ add_subdirectory(c) | ||
108 | if(TARGET format_reader) | ||
109 | install(TARGETS format_reader | ||
110 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT tests EXCLUDE_FROM_ALL | ||
111 | - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests EXCLUDE_FROM_ALL) | ||
112 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT tests) | ||
113 | endif() | ||
114 | |||
115 | openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils) | ||
116 | diff --git a/samples/c/common/opencv_c_wrapper/CMakeLists.txt b/samples/c/common/opencv_c_wrapper/CMakeLists.txt | ||
117 | index a8e6e5172..aa3d2fe0e 100644 | ||
118 | --- a/samples/c/common/opencv_c_wrapper/CMakeLists.txt | ||
119 | +++ b/samples/c/common/opencv_c_wrapper/CMakeLists.txt | ||
120 | @@ -34,3 +34,5 @@ install( | ||
121 | RUNTIME DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL | ||
122 | LIBRARY DESTINATION samples_bin/ COMPONENT samples_bin EXCLUDE_FROM_ALL | ||
123 | ) | ||
124 | + | ||
125 | +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
126 | diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt | ||
127 | index 3433dee0e..0c0fa0723 100644 | ||
128 | --- a/samples/cpp/CMakeLists.txt | ||
129 | +++ b/samples/cpp/CMakeLists.txt | ||
130 | @@ -222,6 +222,8 @@ macro(ie_add_sample) | ||
131 | EXCLUDE_FROM_ALL | ||
132 | ) | ||
133 | |||
134 | + install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) | ||
135 | + | ||
136 | # create global target with all samples / demo apps | ||
137 | if(NOT TARGET ie_samples) | ||
138 | add_custom_target(ie_samples ALL) | ||
139 | diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt | ||
140 | index 9ad26ba95..0853e2370 100644 | ||
141 | --- a/scripts/CMakeLists.txt | ||
142 | +++ b/scripts/CMakeLists.txt | ||
143 | @@ -28,7 +28,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}" | ||
144 | |||
145 | # install setupvars | ||
146 | |||
147 | -ie_cpack_add_component(setupvars REQUIRED) | ||
148 | +#ie_cpack_add_component(setupvars REQUIRED) | ||
149 | |||
150 | if(UNIX) | ||
151 | set(_setupvars_file setupvars/setupvars.sh) | ||
152 | @@ -43,13 +43,13 @@ elseif(WIN32) | ||
153 | file(WRITE "${_setupvars_file}" "${_setupvars_content}") | ||
154 | endif() | ||
155 | endif() | ||
156 | -install(PROGRAMS "${_setupvars_file}" | ||
157 | - DESTINATION . | ||
158 | - COMPONENT setupvars) | ||
159 | +#install(PROGRAMS "${_setupvars_file}" | ||
160 | +# DESTINATION . | ||
161 | +# COMPONENT setupvars) | ||
162 | |||
163 | # install install_dependencies | ||
164 | |||
165 | -if(LINUX) | ||
166 | +if (FALSE) | ||
167 | ie_cpack_add_component(install_dependencies REQUIRED) | ||
168 | install(DIRECTORY install_dependencies/ | ||
169 | DESTINATION install_dependencies | ||
170 | diff --git a/src/bindings/c/src/CMakeLists.txt b/src/bindings/c/src/CMakeLists.txt | ||
171 | index 9200d0bda..b3636e071 100644 | ||
172 | --- a/src/bindings/c/src/CMakeLists.txt | ||
173 | +++ b/src/bindings/c/src/CMakeLists.txt | ||
174 | @@ -43,8 +43,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets | ||
175 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core_c | ||
176 | ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core_c | ||
177 | LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core_c | ||
178 | - INCLUDES DESTINATION runtime/include/ie) | ||
179 | + INCLUDES DESTINATION include/ie) | ||
180 | |||
181 | install(DIRECTORY ${InferenceEngine_C_API_SOURCE_DIR}/include/ | ||
182 | - DESTINATION runtime/include/ie | ||
183 | + DESTINATION include/ie | ||
184 | COMPONENT core_c_dev) | ||
185 | diff --git a/src/cmake/openvino.cmake b/src/cmake/openvino.cmake | ||
186 | index c46548468..3d65a20a5 100644 | ||
187 | --- a/src/cmake/openvino.cmake | ||
188 | +++ b/src/cmake/openvino.cmake | ||
189 | @@ -59,8 +59,8 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets | ||
190 | RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core | ||
191 | ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core | ||
192 | LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core | ||
193 | - INCLUDES DESTINATION runtime/include | ||
194 | - runtime/include/ie) | ||
195 | + INCLUDES DESTINATION include | ||
196 | + include/ie) | ||
197 | |||
198 | # --------------- OpenVINO runtime library dev ------------------------------ | ||
199 | add_library(${TARGET_NAME}_dev INTERFACE) | ||
200 | @@ -96,7 +96,7 @@ ie_cpack_add_component(core_dev REQUIRED DEPENDS core ${core_dev_components}) | ||
201 | |||
202 | if(BUILD_SHARED_LIBS) | ||
203 | install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml | ||
204 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
205 | + DESTINATION ${IE_CPACK_LIBRARY_PATH} | ||
206 | COMPONENT core) | ||
207 | |||
208 | # for InferenceEngineUnitTest | ||
209 | @@ -115,7 +115,7 @@ endif() | ||
210 | install(EXPORT OpenVINOTargets | ||
211 | FILE OpenVINOTargets.cmake | ||
212 | NAMESPACE openvino:: | ||
213 | - DESTINATION runtime/cmake | ||
214 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO | ||
215 | COMPONENT core_dev) | ||
216 | |||
217 | set(OV_CORE_DIR "${CMAKE_BINARY_DIR}/src/core") | ||
218 | @@ -161,10 +161,10 @@ configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cm | ||
219 | install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake" | ||
220 | "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" | ||
221 | "${OpenVINO_SOURCE_DIR}/src/cmake/ie_parallel.cmake" | ||
222 | - DESTINATION runtime/cmake | ||
223 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine | ||
224 | COMPONENT core_dev) | ||
225 | |||
226 | install(FILES "${CMAKE_BINARY_DIR}/share/OpenVINOConfig.cmake" | ||
227 | "${CMAKE_BINARY_DIR}/OpenVINOConfig-version.cmake" | ||
228 | - DESTINATION runtime/cmake | ||
229 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenVINO | ||
230 | COMPONENT core_dev) | ||
231 | diff --git a/src/common/preprocessing/CMakeLists.txt b/src/common/preprocessing/CMakeLists.txt | ||
232 | index e41e286c9..11aaffca6 100644 | ||
233 | --- a/src/common/preprocessing/CMakeLists.txt | ||
234 | +++ b/src/common/preprocessing/CMakeLists.txt | ||
235 | @@ -202,7 +202,7 @@ openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME}) | ||
236 | |||
237 | if(BUILD_SHARED_LIBS) | ||
238 | install(TARGETS ${TARGET_NAME} | ||
239 | - LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) | ||
240 | + LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) | ||
241 | else() | ||
242 | ov_install_static_lib(${TARGET_NAME} core) | ||
243 | endif() | ||
244 | diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt | ||
245 | index cc64b94ca..5f0dcf20c 100644 | ||
246 | --- a/src/core/CMakeLists.txt | ||
247 | +++ b/src/core/CMakeLists.txt | ||
248 | @@ -114,7 +114,7 @@ target_include_directories(ngraph INTERFACE $<BUILD_INTERFACE:${OV_CORE_INCLUDE_ | ||
249 | #----------------------------------------------------------------------------------------------- | ||
250 | |||
251 | install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ | ||
252 | - DESTINATION "runtime/include" | ||
253 | + DESTINATION "include" | ||
254 | COMPONENT core_dev | ||
255 | FILES_MATCHING | ||
256 | PATTERN "*.hpp" | ||
257 | @@ -130,5 +130,5 @@ write_basic_package_version_file(${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake | ||
258 | |||
259 | install(FILES ${CMAKE_BINARY_DIR}/ngraphConfig.cmake | ||
260 | ${CMAKE_BINARY_DIR}/ngraphConfigVersion.cmake | ||
261 | - DESTINATION "runtime/cmake" | ||
262 | + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph | ||
263 | COMPONENT core_dev) | ||
264 | diff --git a/src/inference/CMakeLists.txt b/src/inference/CMakeLists.txt | ||
265 | index ddd2fdcbc..f4ad1e623 100644 | ||
266 | --- a/src/inference/CMakeLists.txt | ||
267 | +++ b/src/inference/CMakeLists.txt | ||
268 | @@ -204,7 +204,7 @@ set_target_properties(${TARGET_NAME}_obj | ||
269 | |||
270 | openvino_developer_export_targets(COMPONENT core_legacy TARGETS ${TARGET_NAME}_plugin_api) | ||
271 | |||
272 | -install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION runtime/include | ||
273 | +install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION include | ||
274 | COMPONENT core_dev) | ||
275 | |||
276 | # Install static libraries for case BUILD_SHARED_LIBS=OFF | ||
277 | diff --git a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt | ||
278 | index 3993bd973..99287bad5 100644 | ||
279 | --- a/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt | ||
280 | +++ b/src/plugins/intel_gpu/src/kernel_selector/CMakeLists.txt | ||
281 | @@ -94,7 +94,7 @@ add_custom_command( | ||
282 | COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json ${TUNING_CACHE_PATH}/cache.json) | ||
283 | |||
284 | install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/core/cache/cache.json | ||
285 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
286 | + DESTINATION ${IE_CPACK_LIBRARY_PATH} | ||
287 | COMPONENT gpu) | ||
288 | |||
289 | ov_install_static_lib(${TARGET_NAME} gpu) | ||
290 | diff --git a/src/plugins/intel_myriad/myriad_dependencies.cmake b/src/plugins/intel_myriad/myriad_dependencies.cmake | ||
291 | index 5bba4235f..69c1470a7 100644 | ||
292 | --- a/src/plugins/intel_myriad/myriad_dependencies.cmake | ||
293 | +++ b/src/plugins/intel_myriad/myriad_dependencies.cmake | ||
294 | @@ -80,7 +80,7 @@ foreach(firmware_name IN LISTS VPU_SUPPORTED_FIRMWARES) | ||
295 | VERBATIM) | ||
296 | |||
297 | install(FILES ${${var_name}} | ||
298 | - DESTINATION ${IE_CPACK_RUNTIME_PATH} | ||
299 | + DESTINATION ${IE_CPACK_LIBRARY_PATH} | ||
300 | COMPONENT myriad) | ||
301 | |||
302 | if(ENABLE_INTEL_MYRIAD AND ENABLE_BEH_TESTS) | ||
303 | diff --git a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt | ||
304 | index 12a2f15e4..893146294 100644 | ||
305 | --- a/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt | ||
306 | +++ b/src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt | ||
307 | @@ -56,6 +56,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL | ||
308 | # install | ||
309 | if (LINUX) | ||
310 | install(FILES ${OpenVINO_SOURCE_DIR}/src/plugins/intel_myriad/third_party/mvnc/src/97-myriad-usbboot.rules | ||
311 | - DESTINATION runtime/3rdparty | ||
312 | + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d | ||
313 | COMPONENT myriad) | ||
314 | endif() | ||
315 | diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt | ||
316 | index c8638f7fd..ba30641c5 100644 | ||
317 | --- a/tools/CMakeLists.txt | ||
318 | +++ b/tools/CMakeLists.txt | ||
319 | @@ -20,7 +20,7 @@ endif() | ||
320 | ie_cpack_add_component(deployment_manager REQUIRED) | ||
321 | |||
322 | install(DIRECTORY deployment_manager | ||
323 | - DESTINATION tools | ||
324 | + DESTINATION share/openvino/tools | ||
325 | COMPONENT deployment_manager | ||
326 | USE_SOURCE_PERMISSIONS) | ||
327 | |||
328 | diff --git a/tools/compile_tool/CMakeLists.txt b/tools/compile_tool/CMakeLists.txt | ||
329 | index d19eb5cc1..9fc929cbb 100644 | ||
330 | --- a/tools/compile_tool/CMakeLists.txt | ||
331 | +++ b/tools/compile_tool/CMakeLists.txt | ||
332 | @@ -38,9 +38,9 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) | ||
333 | ie_cpack_add_component(core_tools DEPENDS core) | ||
334 | |||
335 | install(TARGETS compile_tool | ||
336 | - RUNTIME DESTINATION tools/compile_tool | ||
337 | + RUNTIME DESTINATION bin | ||
338 | COMPONENT core_tools) | ||
339 | |||
340 | -install(FILES README.md | ||
341 | - DESTINATION tools/compile_tool | ||
342 | - COMPONENT core_tools) | ||
343 | +#install(FILES README.md | ||
344 | +# DESTINATION tools/compile_tool | ||
345 | +# COMPONENT core_tools) | ||
346 | -- | ||
347 | 2.35.1 | ||
348 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch new file mode 100644 index 00000000..bbdeaa2a --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-protobuf-allow-target-protoc-to-be-built.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 450d94b475460d1af32b207d0ced495794863f0d Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 29 Nov 2023 12:55:19 +0530 | ||
4 | Subject: [PATCH 3/3] protobuf: allow target protoc to be built | ||
5 | |||
6 | We can run target binaries using a qemu wrapper so allow these to be | ||
7 | built and run. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | cmake/developer_package/frontends/frontends.cmake | 2 +- | ||
14 | thirdparty/protobuf/CMakeLists.txt | 2 +- | ||
15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/cmake/developer_package/frontends/frontends.cmake b/cmake/developer_package/frontends/frontends.cmake | ||
18 | index f3b5520d6d2..7579f638c5a 100644 | ||
19 | --- a/cmake/developer_package/frontends/frontends.cmake | ||
20 | +++ b/cmake/developer_package/frontends/frontends.cmake | ||
21 | @@ -163,7 +163,7 @@ macro(ov_add_frontend) | ||
22 | set(OUTPUT_PB_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${relative_path}/${FILE_WE}.pb.h) | ||
23 | add_custom_command( | ||
24 | OUTPUT "${OUTPUT_PB_SRC}" "${OUTPUT_PB_HEADER}" | ||
25 | - COMMAND ${PROTOC_EXECUTABLE} ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} | ||
26 | + COMMAND protoc ARGS --cpp_out ${CMAKE_CURRENT_BINARY_DIR} -I ${protofiles_root_dir} ${proto_file} | ||
27 | DEPENDS ${PROTOC_DEPENDENCY} ${proto_file} | ||
28 | COMMENT "Running C++ protocol buffer compiler (${PROTOC_EXECUTABLE}) on ${proto_file_relative}" | ||
29 | VERBATIM | ||
30 | diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt | ||
31 | index 15f32601f23..36853caf7dc 100644 | ||
32 | --- a/thirdparty/protobuf/CMakeLists.txt | ||
33 | +++ b/thirdparty/protobuf/CMakeLists.txt | ||
34 | @@ -31,7 +31,7 @@ unset(HAVE_ZLIB CACHE) | ||
35 | if(CMAKE_CROSSCOMPILING OR | ||
36 | (APPLE AND (HOST_X86_64 AND AARCH64)) OR | ||
37 | (MSVC AND (HOST_X86_64 AND (AARCH64 OR ARM)))) | ||
38 | - set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protoc binaries" FORCE) | ||
39 | + set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) | ||
40 | else() | ||
41 | set(protobuf_BUILD_PROTOC_BINARIES ON CACHE BOOL "Build protoc binaries" FORCE) | ||
42 | endif() | ||
43 | -- | ||
44 | 2.34.1 | ||
45 | |||
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch deleted file mode 100644 index 45ed0d27..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/cython-cmake.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | Change the working directory to source to workaround cython | ||
2 | embedding absolute path to the pyx file in output. | ||
3 | |||
4 | Upstream-Status: Inappropriate [OE build specific] | ||
5 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
6 | |||
7 | diff --git a/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake b/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake | ||
8 | index f14662ad50..8d199fe328 100644 | ||
9 | --- a/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake | ||
10 | +++ b/src/bindings/python/src/compatibility/openvino/cmake/UseCython.cmake | ||
11 | @@ -259,7 +259,7 @@ function( compile_pyx _name generated_file ) | ||
12 | add_custom_command( OUTPUT ${_generated_file} | ||
13 | COMMAND ${CYTHON_EXECUTABLE} | ||
14 | ARGS ${cxx_arg} ${include_directory_arg} ${version_arg} | ||
15 | - ${annotate_arg} ${no_docstrings_arg} ${cython_debug_arg} ${CYTHON_FLAGS} | ||
16 | + ${annotate_arg} ${no_docstrings_arg} ${cython_debug_arg} ${CYTHON_FLAGS} -w ${CMAKE_CURRENT_SOURCE_DIR} | ||
17 | --output-file ${_generated_file} ${pyx_locations} | ||
18 | DEPENDS ${pyx_locations} ${pxd_dependencies} ${pxi_dependencies} | ||
19 | IMPLICIT_DEPENDS ${pyx_lang} ${c_header_dependencies} | ||