summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch423
1 files changed, 193 insertions, 230 deletions
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
index b16135ee..315385d8 100644
--- 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
@@ -1,51 +1,44 @@
1From 47ff7f056d219a8a9f02a8b533e1d32972b84589 Mon Sep 17 00:00:00 2001 1From b0f30ab7ecdac98afa72a31371a393a73f855b3c Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 8 Apr 2021 14:19:51 +0800 3Date: Thu, 7 Apr 2022 21:39:26 +0800
4Subject: [PATCH] inference-engine: use system installed packages 4Subject: [PATCH] Use system installed dependencies
5 5
6Use installed versions of ade, protobuf, zlib and tbb. 6Use the system versions of libva, tbb, OpenCV, ade and zlib.
7
8Don't fetch pybind11 at runtime and use the one that we have fetched while
9running do_fetch.
10 7
11Upstream-Status: Inappropriate 8Upstream-Status: Inappropriate
12
13Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 9Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
10
14--- 11---
15 cmake/dependencies.cmake | 19 -------- 12 cmake/dependencies.cmake | 75 -------------------------
16 inference-engine/CMakeLists.txt | 6 +-- 13 cmake/extra_modules.cmake | 4 +-
17 inference-engine/cmake/dependencies.cmake | 45 ------------------- 14 cmake/templates/OpenVINOConfig.cmake.in | 9 ---
18 inference-engine/cmake/ie_parallel.cmake | 2 +- 15 src/cmake/ie_parallel.cmake | 2 +-
19 .../templates/InferenceEngineConfig.cmake.in | 10 ----- 16 src/plugins/intel_gpu/include/va/va.h | 6 --
20 inference-engine/samples/CMakeLists.txt | 3 +- 17 tests/fuzz/src/CMakeLists.txt | 3 +-
21 .../src/inference_engine/CMakeLists.txt | 4 +- 18 thirdparty/CMakeLists.txt | 26 ++++-----
22 .../common_test_utils/CMakeLists.txt | 4 +- 19 thirdparty/cnpy/CMakeLists.txt | 2 +-
23 .../unit_test_utils/CMakeLists.txt | 3 +- 20 8 files changed, 15 insertions(+), 112 deletions(-)
24 inference-engine/thirdparty/CMakeLists.txt | 5 +-- 21 delete mode 100644 src/plugins/intel_gpu/include/va/va.h
25 ngraph/python/CMakeLists.txt | 12 +----
26 tests/fuzz/src/CMakeLists.txt | 1 -
27 thirdparty/CMakeLists.txt | 1 -
28 thirdparty/cnpy/CMakeLists.txt | 4 +-
29 14 files changed, 14 insertions(+), 105 deletions(-)
30 22
31diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake 23diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
32index 6cb15a077e..74d4ac4124 100644 24index e2f941fcd..1fcc358ef 100644
33--- a/cmake/dependencies.cmake 25--- a/cmake/dependencies.cmake
34+++ b/cmake/dependencies.cmake 26+++ b/cmake/dependencies.cmake
35@@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}") 27@@ -29,26 +29,6 @@ endif()
36 if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
37 set(protoc_version "3.7.1")
38 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-
39- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT 32- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
40- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" 33- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
41- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64" 34- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64"
42- SHA256 "a1bedd5c05ca51e49f8f254faa3d7331e05b3a806c151fb111d582f154d0fee8" 35- SHA256 "42fde2b6044c1f74c7e86d4e03b43aac87128ddf57ac6ed8c4eab7a1e21bbf21"
43- ) 36- )
44- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) 37- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
45- 38-
46- reset_deps_cache(SYSTEM_PROTOC) 39- reset_deps_cache(SYSTEM_PROTOC)
47- 40-
48- find_program( 41- find_host_program(
49- SYSTEM_PROTOC 42- SYSTEM_PROTOC
50- NAMES protoc 43- NAMES protoc
51- PATHS "${SYSTEM_PROTOC_ROOT}/bin" 44- PATHS "${SYSTEM_PROTOC_ROOT}/bin"
@@ -56,57 +49,29 @@ index 6cb15a077e..74d4ac4124 100644
56- 49-
57- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") 50- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
58 endif() 51 endif()
59diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
60index 1ac7fd8bf6..0615873110 100644
61--- a/inference-engine/CMakeLists.txt
62+++ b/inference-engine/CMakeLists.txt
63@@ -18,7 +18,7 @@ function(ie_developer_export_targets)
64 endfunction()
65
66 function(ie_developer_export)
67- set(all_dev_targets gflags ie_libraries)
68+ set(all_dev_targets ie_libraries)
69 foreach(component IN LISTS openvino_export_components)
70 export(TARGETS ${${component}} NAMESPACE IE::
71 APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
72@@ -142,7 +142,7 @@ endif()
73 # Developer package
74 #
75
76-openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader gflags ie_samples_utils)
77+openvino_developer_export_targets(COMPONENT openvino_common TARGETS format_reader ie_samples_utils)
78
79 # for Template plugin
80 if(NGRAPH_INTERPRETER_ENABLE)
81@@ -158,7 +158,7 @@ function(ie_generate_dev_package_config)
82 configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/InferenceEngineDeveloperPackageConfig.cmake.in"
83 "${CMAKE_BINARY_DIR}/InferenceEngineDeveloperPackageConfig.cmake"
84 INSTALL_DESTINATION share # not used
85- PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR;gflags_BINARY_DIR"
86+ PATH_VARS "OpenVINO_MAIN_SOURCE_DIR;IE_MAIN_SOURCE_DIR"
87 NO_CHECK_REQUIRED_COMPONENTS_MACRO)
88 52
89 configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in" 53 if(ENABLE_INTEL_MYRIAD)
90diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake 54@@ -102,61 +82,6 @@ if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
91index b270c46f2d..5f85197a85 100644 55 set(IE_PATH_TO_DEPS "${THIRDPARTY_SERVER_PATH}")
92--- a/inference-engine/cmake/dependencies.cmake 56 endif()
93+++ b/inference-engine/cmake/dependencies.cmake
94@@ -81,51 +81,6 @@ endif ()
95 if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
96 reset_deps_cache(TBBROOT TBB_DIR)
97 57
98- if (WIN32 AND X86_64) 58- if(WIN32 AND X86_64)
99- #TODO: add target_path to be platform specific as well, to avoid following if 59- # TODO: add target_path to be platform specific as well, to avoid following if
100- RESOLVE_DEPENDENCY(TBB 60- RESOLVE_DEPENDENCY(TBB
101- ARCHIVE_WIN "tbb2020_20200415_win.zip" 61- ARCHIVE_WIN "tbb2020_20200415_win.zip"
102- TARGET_PATH "${TEMP}/tbb" 62- TARGET_PATH "${TEMP}/tbb"
103- ENVIRONMENT "TBBROOT" 63- ENVIRONMENT "TBBROOT"
104- SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479") 64- SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479")
105- RESOLVE_DEPENDENCY(TBBBIND_2_4 65- if(ENABLE_TBBBIND_2_5)
106- ARCHIVE_WIN "tbbbind_2_4_static_win_v2.zip" 66- RESOLVE_DEPENDENCY(TBBBIND_2_5
107- TARGET_PATH "${TEMP}/tbbbind_2_4" 67- ARCHIVE_WIN "tbbbind_2_5_static_win_v1.zip"
108- ENVIRONMENT "TBBBIND_2_4_ROOT" 68- TARGET_PATH "${TEMP}/tbbbind_2_5"
109- SHA256 "90dc165652f6ac2ed3014c71e57f797fcc4b11e1498a468e3d2c85deb2a4186a") 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()
110- elseif(ANDROID) # Should be before LINUX due LINUX is detected as well 75- elseif(ANDROID) # Should be before LINUX due LINUX is detected as well
111- RESOLVE_DEPENDENCY(TBB 76- RESOLVE_DEPENDENCY(TBB
112- ARCHIVE_ANDROID "tbb2020_20200404_android.tgz" 77- ARCHIVE_ANDROID "tbb2020_20200404_android.tgz"
@@ -119,11 +84,16 @@ index b270c46f2d..5f85197a85 100644
119- TARGET_PATH "${TEMP}/tbb" 84- TARGET_PATH "${TEMP}/tbb"
120- ENVIRONMENT "TBBROOT" 85- ENVIRONMENT "TBBROOT"
121- SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008") 86- SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008")
122- RESOLVE_DEPENDENCY(TBBBIND_2_4 87- if(ENABLE_TBBBIND_2_5)
123- ARCHIVE_LIN "tbbbind_2_4_static_lin_v2.tgz" 88- RESOLVE_DEPENDENCY(TBBBIND_2_5
124- TARGET_PATH "${TEMP}/tbbbind_2_4" 89- ARCHIVE_LIN "tbbbind_2_5_static_lin_v2.tgz"
125- ENVIRONMENT "TBBBIND_2_4_ROOT" 90- TARGET_PATH "${TEMP}/tbbbind_2_5"
126- SHA256 "6dc926258c6cd3cba0f5c2cc672fd2ad599a1650fe95ab11122e8f361a726cb6") 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()
127- elseif(LINUX AND AARCH64) 97- elseif(LINUX AND AARCH64)
128- RESOLVE_DEPENDENCY(TBB 98- RESOLVE_DEPENDENCY(TBB
129- ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz" 99- ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz"
@@ -141,193 +111,186 @@ index b270c46f2d..5f85197a85 100644
141- endif() 111- endif()
142- 112-
143 update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder") 113 update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder")
144 update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder") 114 if(EXISTS "${TBBROOT}/lib/cmake/TBB/TBBConfig.cmake")
115 # oneTBB case
116diff --git a/cmake/extra_modules.cmake b/cmake/extra_modules.cmake
117index 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)
145 127
146diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake 128 configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in"
147index edf3d2f2b2..6579d0f7ea 100644 129@@ -45,7 +45,7 @@ function(ov_generate_dev_package_config)
148--- a/inference-engine/cmake/ie_parallel.cmake 130 configure_package_config_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINODeveloperPackageConfig.cmake.in"
149+++ b/inference-engine/cmake/ie_parallel.cmake 131 "${CMAKE_BINARY_DIR}/OpenVINODeveloperPackageConfig.cmake"
150@@ -26,7 +26,7 @@ function(set_ie_threading_interface_for TARGET_NAME) 132 INSTALL_DESTINATION share # not used
151 find_dependency(TBB COMPONENTS tbb tbbmalloc) 133- PATH_VARS "OpenVINO_SOURCE_DIR;gflags_BINARY_DIR"
152 endif() 134+ PATH_VARS "OpenVINO_SOURCE_DIR"
153 set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE) 135 NO_CHECK_REQUIRED_COMPONENTS_MACRO)
154- set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) 136
155+ set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE) 137 configure_file("${OpenVINO_SOURCE_DIR}/cmake/templates/OpenVINOConfig-version.cmake.in"
156 set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE) 138diff --git a/cmake/templates/OpenVINOConfig.cmake.in b/cmake/templates/OpenVINOConfig.cmake.in
157 if (NOT TBB_FOUND) 139index 00e892f2b..7c686fa07 100644
158 ext_message(WARNING "TBB was not found by the configured TBB_DIR/TBBROOT path.\ 140--- a/cmake/templates/OpenVINOConfig.cmake.in
159diff --git a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in 141+++ b/cmake/templates/OpenVINOConfig.cmake.in
160index 261edbf3d7..bf217a789a 100644 142@@ -146,15 +146,6 @@ set(_ov_package_prefix_dir "${PACKAGE_PREFIX_DIR}")
161--- a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in
162+++ b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in
163@@ -86,16 +86,6 @@ endfunction()
164 set(IE_PACKAGE_PREFIX_DIR "${PACKAGE_PREFIX_DIR}")
165 143
166 set(THREADING "@THREADING@") 144 set(THREADING "@THREADING@")
167-if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND) 145 if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND NOT TBB_FOUND)
168- set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@") 146- set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@")
169- _ie_find_dependency(TBB 147- _ov_find_dependency(TBB
170- COMPONENTS tbb tbbmalloc 148- COMPONENTS tbb tbbmalloc
171- CONFIG 149- CONFIG
172- PATHS ${TBBROOT}/cmake 150- PATHS ${TBBROOT}/cmake
173- ${_tbb_dir} 151- ${_tbb_dir}
174- NO_CMAKE_FIND_ROOT_PATH 152- NO_CMAKE_FIND_ROOT_PATH
175- NO_DEFAULT_PATH) 153- NO_DEFAULT_PATH)
176-endif() 154-
177 155 set(install_tbbbind "@install_tbbbind@")
178 set_and_check(_ngraph_dir "@PACKAGE_IE_NGRAPH_DIR@") 156 if(install_tbbbind)
179 _ie_find_dependency(ngraph 157 set_and_check(_tbb_bind_dir "@PACKAGE_IE_TBBBIND_DIR@")
180diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt 158diff --git a/src/cmake/ie_parallel.cmake b/src/cmake/ie_parallel.cmake
181index 7924c56779..ae93857944 100644 159index a036b019c..031f1ea48 100644
182--- a/inference-engine/samples/CMakeLists.txt 160--- a/src/cmake/ie_parallel.cmake
183+++ b/inference-engine/samples/CMakeLists.txt 161+++ b/src/cmake/ie_parallel.cmake
184@@ -126,11 +126,10 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") 162@@ -34,7 +34,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
185 add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL) 163 endforeach()
186 set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) 164 endif()
187 endfunction() 165 set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE)
188- add_gflags() 166- set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE)
189+ #add_gflags() 167+ set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE)
190 endif() 168 set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE)
191 169 if (NOT TBB_FOUND)
192 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib") 170 set(THREADING "SEQ" PARENT_SCOPE)
193- add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL) 171diff --git a/src/plugins/intel_gpu/include/va/va.h b/src/plugins/intel_gpu/include/va/va.h
194 endif() 172deleted file mode 100644
195 173index 5c8a5c6f6..000000000
196 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cnpy") 174--- a/src/plugins/intel_gpu/include/va/va.h
197diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt 175+++ /dev/null
198index e8ed1a5c4c..2fcb0bed4a 100644 176@@ -1,6 +0,0 @@
199--- a/inference-engine/src/inference_engine/CMakeLists.txt 177-// Copyright (C) 2018-2022 Intel Corporation
200+++ b/inference-engine/src/inference_engine/CMakeLists.txt 178-// SPDX-License-Identifier: Apache-2.0
201@@ -290,8 +290,8 @@ configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/Inf 179-//
202 INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}" 180-
203 PATH_VARS ${PATH_VARS}) 181-typedef cl_uint VASurfaceID;
204 182-typedef void* VADisplay;
205-set(IE_INCLUDE_DIR "include") 183diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt
206-set(IE_NGRAPH_DIR "../ngraph/cmake") 184index 5e6b7b168..a81c51bb7 100644
207+set(IE_INCLUDE_DIR "../../include") 185--- a/tests/fuzz/src/CMakeLists.txt
208+set(IE_NGRAPH_DIR "ngraph") 186+++ b/tests/fuzz/src/CMakeLists.txt
209 set(IE_TBB_DIR "${IE_TBB_DIR_INSTALL}") 187@@ -10,14 +10,13 @@ add_custom_target(fuzz)
210 set(IE_PARALLEL_CMAKE "share/ie_parallel.cmake") 188 FILE(GLOB tests "*-fuzzer.cc")
211
212diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
213index 5e8643dc5d..031557efc3 100644
214--- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
215+++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt
216@@ -43,7 +43,7 @@ function(add_gtest_libraries)
217 PROPERTIES FOLDER thirdparty)
218 endfunction()
219 189
220-add_gtest_libraries() 190 add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy)
221+#add_gtest_libraries() 191-add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib)
222 192
223 if (MSVC) 193 foreach(test_source ${tests})
224 set(PUGI pugixml_mt) 194 get_filename_component(test_name ${test_source} NAME_WE)
225@@ -52,8 +52,6 @@ else () 195 add_fuzzer(${test_name} ${test_source})
226 endif ()
227 196
228 list(APPEND EXPORT_DEPENDENCIES 197 target_link_libraries(${test_name} PRIVATE
229- gtest 198- openvino::runtime cnpy zlib)
230- gtest_main 199+ openvino::runtime cnpy z)
231 )
232 200
233 set(TARGET_NAME commonTestUtils) 201 add_dependencies(fuzz ${test_name})
234diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
235index 7c1d89eabf..2fbd8fc324 100644
236--- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
237+++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt
238@@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine)
239 202
240 list(APPEND EXPORT_DEPENDENCIES 203diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
241 commonTestUtils_s 204index 2d61c5fd7..97b372998 100644
242- inference_engine_s 205--- a/thirdparty/CMakeLists.txt
243- gmock) 206+++ b/thirdparty/CMakeLists.txt
244+ inference_engine_s) 207@@ -12,10 +12,9 @@ endif()
245 208
246 addIeTarget( 209 add_subdirectory(ittapi)
247 NAME ${TARGET_NAME} 210 add_subdirectory(itt_collector EXCLUDE_FROM_ALL)
248diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt 211-add_subdirectory(zlib EXCLUDE_FROM_ALL)
249index f028ebdd8a..9c5bd53466 100644 212 add_subdirectory(cnpy EXCLUDE_FROM_ALL)
250--- a/inference-engine/thirdparty/CMakeLists.txt 213 if(ENABLE_INTEL_GPU)
251+++ b/inference-engine/thirdparty/CMakeLists.txt 214- add_subdirectory(ocl)
252@@ -62,14 +62,13 @@ else() 215+ #add_subdirectory(ocl)
253 target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
254 endif() 216 endif()
255 217
256-add_subdirectory(ade EXCLUDE_FROM_ALL) 218 add_subdirectory(xbyak EXCLUDE_FROM_ALL)
257 add_subdirectory(fluid/modules/gapi) 219@@ -52,21 +51,16 @@ endif()
220 add_library(ocv_hal INTERFACE)
221 target_include_directories(ocv_hal INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ocv")
258 222
223-add_subdirectory(ade EXCLUDE_FROM_ALL)
224 add_subdirectory(fluid/modules/gapi EXCLUDE_FROM_ALL)
259-set_target_properties(ade fluid PROPERTIES FOLDER thirdparty) 225-set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
260+set_target_properties(fluid PROPERTIES FOLDER thirdparty)
261
262 # developer package
263
264-openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid) 226-openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid)
227+set_target_properties(fluid PROPERTIES FOLDER thirdparty)
265+openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid) 228+openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid)
266 229
267 if (NOT USE_SYSTEM_PUGIXML) 230-ov_install_static_lib(ade openvino_common)
268 set_target_properties(pugixml PROPERTIES FOLDER thirdparty) 231 ov_install_static_lib(fluid openvino_common)
269diff --git a/ngraph/python/CMakeLists.txt b/ngraph/python/CMakeLists.txt
270index 501bfffb4b..b45612c19c 100644
271--- a/ngraph/python/CMakeLists.txt
272+++ b/ngraph/python/CMakeLists.txt
273@@ -17,17 +17,7 @@ endif()
274 232
275 include(FetchContent) 233 #
234 # Gflags
235 #
276 236
277-FetchContent_Declare( 237-add_subdirectory(gflags EXCLUDE_FROM_ALL)
278- pybind11 238-openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags)
279- GIT_REPOSITORY "https://github.com/pybind/pybind11.git"
280- GIT_TAG "v2.5.0"
281-)
282- 239-
283-FetchContent_GetProperties(pybind11) 240 #
284-if(NOT pybind11_POPULATED) 241 # Google Tests framework
285- FetchContent_Populate(pybind11) 242 #
286- add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR}) 243@@ -89,13 +83,13 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
287-endif() 244 set(Protobuf_DEBUG ON)
288+add_subdirectory(pybind11) 245 endif()
289 246 find_package(Protobuf 3.18.2 REQUIRED)
290 # PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR are defined inside pybind11 247- set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite)
291 set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) 248- set(Protobuf_LIBRARIES protobuf::libprotobuf)
292diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt 249- set(SYSTEM_PROTOC protobuf::protoc)
293index b9400d9e7e..669938526c 100644 250+ set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite)
294--- a/tests/fuzz/src/CMakeLists.txt 251+ set(Protobuf_LIBRARIES protobuf::libprotobuf)
295+++ b/tests/fuzz/src/CMakeLists.txt 252+ #set(SYSTEM_PROTOC protobuf::protoc)
296@@ -10,7 +10,6 @@ add_custom_target(fuzz) 253 set(PROTOC_EXECUTABLE ${SYSTEM_PROTOC})
297 FILE(GLOB tests "*-fuzzer.cc")
298 254
299 add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy) 255 foreach(target ${SYSTEM_PROTOC} ${Protobuf_LIBRARIES} ${Protobuf_LITE_LIBRARIES})
300-add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib) 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)
301 271
302 foreach(test_source ${tests}) 272@@ -116,7 +110,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
303 get_filename_component(test_name ${test_source} NAME_WE) 273 set(link_type INTERFACE)
304diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt 274 endif()
305index 2c6b656408..4e86bd21ef 100644 275 if(CMAKE_COMPILER_IS_GNUCXX OR OV_COMPILER_IS_CLANG)
306--- a/thirdparty/CMakeLists.txt 276- target_compile_options(${target} ${link_type} -Wno-undef)
307+++ b/thirdparty/CMakeLists.txt 277+ #target_compile_options(${target} ${link_type} -Wno-undef)
308@@ -5,6 +5,5 @@ 278 endif()
309 add_subdirectory(ittapi) 279 endforeach()
310 add_subdirectory(itt_collector) 280 endif()
311 add_subdirectory(xbyak EXCLUDE_FROM_ALL)
312-add_subdirectory(zlib EXCLUDE_FROM_ALL)
313 add_subdirectory(cnpy EXCLUDE_FROM_ALL)
314 openvino_developer_export_targets(COMPONENT openvino_common TARGETS xbyak)
315diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt 281diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt
316index 5571cd5f78..e30604927a 100644 282index 041031e92..793de9845 100644
317--- a/thirdparty/cnpy/CMakeLists.txt 283--- a/thirdparty/cnpy/CMakeLists.txt
318+++ b/thirdparty/cnpy/CMakeLists.txt 284+++ b/thirdparty/cnpy/CMakeLists.txt
319@@ -14,8 +14,8 @@ if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC") 285@@ -13,7 +13,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$")
320 target_compile_options(${TARGET_NAME} PUBLIC -Wno-unused-variable) 286 PRIVATE -Wno-all)
321 endif() 287 endif()
322 288
323-target_link_libraries(${TARGET_NAME} PUBLIC zlib) 289-target_link_libraries(${TARGET_NAME} PUBLIC zlib)
324+target_link_libraries(${TARGET_NAME} PUBLIC z) 290+target_link_libraries(${TARGET_NAME} PUBLIC z)
325 target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" 291 target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
326 "${CMAKE_CURRENT_SOURCE_DIR}/..")
327 292
328-set_target_properties(cnpy PROPERTIES FOLDER thirdparty) 293 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER thirdparty)
329\ No newline at end of file
330+set_target_properties(cnpy PROPERTIES FOLDER thirdparty)
331-- 294--
3322.32.0 2952.35.1
333 296
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-10 11:52:18 +0000