diff options
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.patch | 206 |
1 files changed, 173 insertions, 33 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 822ab1cc..b16135ee 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,26 +1,35 @@ | |||
1 | From ca4a2b824de61c182b46e28fce875370ce46d4e1 Mon Sep 17 00:00:00 2001 | 1 | From 47ff7f056d219a8a9f02a8b533e1d32972b84589 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anuj.mittal@intel.com> | 2 | From: Anuj Mittal <anuj.mittal@intel.com> |
3 | Date: Thu, 8 Apr 2021 14:19:51 +0800 | 3 | Date: Thu, 8 Apr 2021 14:19:51 +0800 |
4 | Subject: [PATCH] inference-engine: use system installed packages | 4 | Subject: [PATCH] inference-engine: use system installed packages |
5 | 5 | ||
6 | Use installed versions of ade, protobuf and tbb. | 6 | Use installed versions of ade, protobuf, zlib and tbb. |
7 | 7 | ||
8 | Upstream-Status: Pending | 8 | Don't fetch pybind11 at runtime and use the one that we have fetched while |
9 | running do_fetch. | ||
10 | |||
11 | Upstream-Status: Inappropriate | ||
9 | 12 | ||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
11 | --- | 14 | --- |
12 | cmake/dependencies.cmake | 19 ----------- | 15 | cmake/dependencies.cmake | 19 -------- |
13 | inference-engine/CMakeLists.txt | 2 +- | 16 | inference-engine/CMakeLists.txt | 6 +-- |
14 | inference-engine/cmake/dependencies.cmake | 34 ------------------- | 17 | inference-engine/cmake/dependencies.cmake | 45 ------------------- |
15 | inference-engine/cmake/ie_parallel.cmake | 2 +- | 18 | inference-engine/cmake/ie_parallel.cmake | 2 +- |
16 | inference-engine/samples/CMakeLists.txt | 2 +- | 19 | .../templates/InferenceEngineConfig.cmake.in | 10 ----- |
17 | .../common_test_utils/CMakeLists.txt | 4 +-- | 20 | inference-engine/samples/CMakeLists.txt | 3 +- |
21 | .../src/inference_engine/CMakeLists.txt | 4 +- | ||
22 | .../common_test_utils/CMakeLists.txt | 4 +- | ||
18 | .../unit_test_utils/CMakeLists.txt | 3 +- | 23 | .../unit_test_utils/CMakeLists.txt | 3 +- |
19 | inference-engine/thirdparty/CMakeLists.txt | 5 ++- | 24 | inference-engine/thirdparty/CMakeLists.txt | 5 +-- |
20 | 8 files changed, 7 insertions(+), 64 deletions(-) | 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(-) | ||
21 | 30 | ||
22 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake | 31 | diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake |
23 | index aed7614734..f5baa6f86b 100644 | 32 | index 6cb15a077e..74d4ac4124 100644 |
24 | --- a/cmake/dependencies.cmake | 33 | --- a/cmake/dependencies.cmake |
25 | +++ b/cmake/dependencies.cmake | 34 | +++ b/cmake/dependencies.cmake |
26 | @@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}") | 35 | @@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}") |
@@ -48,10 +57,10 @@ index aed7614734..f5baa6f86b 100644 | |||
48 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") | 57 | - update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer") |
49 | endif() | 58 | endif() |
50 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt | 59 | diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt |
51 | index 95c657222e..20cbd5000b 100644 | 60 | index 1ac7fd8bf6..0615873110 100644 |
52 | --- a/inference-engine/CMakeLists.txt | 61 | --- a/inference-engine/CMakeLists.txt |
53 | +++ b/inference-engine/CMakeLists.txt | 62 | +++ b/inference-engine/CMakeLists.txt |
54 | @@ -20,7 +20,7 @@ function(ie_developer_export_targets) | 63 | @@ -18,7 +18,7 @@ function(ie_developer_export_targets) |
55 | endfunction() | 64 | endfunction() |
56 | 65 | ||
57 | function(ie_developer_export) | 66 | function(ie_developer_export) |
@@ -59,12 +68,30 @@ index 95c657222e..20cbd5000b 100644 | |||
59 | + set(all_dev_targets ie_libraries) | 68 | + set(all_dev_targets ie_libraries) |
60 | foreach(component IN LISTS openvino_export_components) | 69 | foreach(component IN LISTS openvino_export_components) |
61 | export(TARGETS ${${component}} NAMESPACE IE:: | 70 | export(TARGETS ${${component}} NAMESPACE IE:: |
62 | APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake") | 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 | |||
89 | configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-version.cmake.in" | ||
63 | diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake | 90 | diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake |
64 | index 6fdfc6f3cd..c07bf0f3c8 100644 | 91 | index b270c46f2d..5f85197a85 100644 |
65 | --- a/inference-engine/cmake/dependencies.cmake | 92 | --- a/inference-engine/cmake/dependencies.cmake |
66 | +++ b/inference-engine/cmake/dependencies.cmake | 93 | +++ b/inference-engine/cmake/dependencies.cmake |
67 | @@ -138,40 +138,6 @@ endif () | 94 | @@ -81,51 +81,6 @@ endif () |
68 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") | 95 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") |
69 | reset_deps_cache(TBBROOT TBB_DIR) | 96 | reset_deps_cache(TBBROOT TBB_DIR) |
70 | 97 | ||
@@ -75,6 +102,11 @@ index 6fdfc6f3cd..c07bf0f3c8 100644 | |||
75 | - TARGET_PATH "${TEMP}/tbb" | 102 | - TARGET_PATH "${TEMP}/tbb" |
76 | - ENVIRONMENT "TBBROOT" | 103 | - ENVIRONMENT "TBBROOT" |
77 | - SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479") | 104 | - SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479") |
105 | - RESOLVE_DEPENDENCY(TBBBIND_2_4 | ||
106 | - ARCHIVE_WIN "tbbbind_2_4_static_win_v2.zip" | ||
107 | - TARGET_PATH "${TEMP}/tbbbind_2_4" | ||
108 | - ENVIRONMENT "TBBBIND_2_4_ROOT" | ||
109 | - SHA256 "90dc165652f6ac2ed3014c71e57f797fcc4b11e1498a468e3d2c85deb2a4186a") | ||
78 | - elseif(ANDROID) # Should be before LINUX due LINUX is detected as well | 110 | - elseif(ANDROID) # Should be before LINUX due LINUX is detected as well |
79 | - RESOLVE_DEPENDENCY(TBB | 111 | - RESOLVE_DEPENDENCY(TBB |
80 | - ARCHIVE_ANDROID "tbb2020_20200404_android.tgz" | 112 | - ARCHIVE_ANDROID "tbb2020_20200404_android.tgz" |
@@ -85,7 +117,13 @@ index 6fdfc6f3cd..c07bf0f3c8 100644 | |||
85 | - RESOLVE_DEPENDENCY(TBB | 117 | - RESOLVE_DEPENDENCY(TBB |
86 | - ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz" | 118 | - ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz" |
87 | - TARGET_PATH "${TEMP}/tbb" | 119 | - TARGET_PATH "${TEMP}/tbb" |
120 | - ENVIRONMENT "TBBROOT" | ||
88 | - SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008") | 121 | - SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008") |
122 | - RESOLVE_DEPENDENCY(TBBBIND_2_4 | ||
123 | - ARCHIVE_LIN "tbbbind_2_4_static_lin_v2.tgz" | ||
124 | - TARGET_PATH "${TEMP}/tbbbind_2_4" | ||
125 | - ENVIRONMENT "TBBBIND_2_4_ROOT" | ||
126 | - SHA256 "6dc926258c6cd3cba0f5c2cc672fd2ad599a1650fe95ab11122e8f361a726cb6") | ||
89 | - elseif(LINUX AND AARCH64) | 127 | - elseif(LINUX AND AARCH64) |
90 | - RESOLVE_DEPENDENCY(TBB | 128 | - RESOLVE_DEPENDENCY(TBB |
91 | - ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz" | 129 | - ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz" |
@@ -106,23 +144,44 @@ index 6fdfc6f3cd..c07bf0f3c8 100644 | |||
106 | update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder") | 144 | update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder") |
107 | 145 | ||
108 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake | 146 | diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake |
109 | index f8988aa105..42fedd10c5 100644 | 147 | index edf3d2f2b2..6579d0f7ea 100644 |
110 | --- a/inference-engine/cmake/ie_parallel.cmake | 148 | --- a/inference-engine/cmake/ie_parallel.cmake |
111 | +++ b/inference-engine/cmake/ie_parallel.cmake | 149 | +++ b/inference-engine/cmake/ie_parallel.cmake |
112 | @@ -6,7 +6,7 @@ function(set_ie_threading_interface_for TARGET_NAME) | 150 | @@ -26,7 +26,7 @@ function(set_ie_threading_interface_for TARGET_NAME) |
113 | if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND) | 151 | find_dependency(TBB COMPONENTS tbb tbbmalloc) |
114 | find_package(TBB COMPONENTS tbb tbbmalloc) | 152 | endif() |
115 | set("TBB_FOUND" ${TBB_FOUND} PARENT_SCOPE) | 153 | set(TBB_FOUND ${TBB_FOUND} PARENT_SCOPE) |
116 | - set("TBB_IMPORTED_TARGETS" ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) | 154 | - set(TBB_IMPORTED_TARGETS ${TBB_IMPORTED_TARGETS} PARENT_SCOPE) |
117 | + set("TBB_IMPORTED_TARGETS" "tbb;tbbmalloc" PARENT_SCOPE) | 155 | + set(TBB_IMPORTED_TARGETS "tbb;tbbmalloc" PARENT_SCOPE) |
118 | set("TBB_VERSION" ${TBB_VERSION} PARENT_SCOPE) | 156 | set(TBB_VERSION ${TBB_VERSION} PARENT_SCOPE) |
119 | if (TBB_FOUND) | 157 | if (NOT TBB_FOUND) |
120 | if (TBB_VERSION VERSION_LESS 2020) | 158 | ext_message(WARNING "TBB was not found by the configured TBB_DIR/TBBROOT path.\ |
159 | diff --git a/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in b/inference-engine/cmake/templates/InferenceEngineConfig.cmake.in | ||
160 | index 261edbf3d7..bf217a789a 100644 | ||
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 | |||
166 | set(THREADING "@THREADING@") | ||
167 | -if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND) | ||
168 | - set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@") | ||
169 | - _ie_find_dependency(TBB | ||
170 | - COMPONENTS tbb tbbmalloc | ||
171 | - CONFIG | ||
172 | - PATHS ${TBBROOT}/cmake | ||
173 | - ${_tbb_dir} | ||
174 | - NO_CMAKE_FIND_ROOT_PATH | ||
175 | - NO_DEFAULT_PATH) | ||
176 | -endif() | ||
177 | |||
178 | set_and_check(_ngraph_dir "@PACKAGE_IE_NGRAPH_DIR@") | ||
179 | _ie_find_dependency(ngraph | ||
121 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt | 180 | diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt |
122 | index dfe9f2303d..6bc44019fe 100644 | 181 | index 7924c56779..ae93857944 100644 |
123 | --- a/inference-engine/samples/CMakeLists.txt | 182 | --- a/inference-engine/samples/CMakeLists.txt |
124 | +++ b/inference-engine/samples/CMakeLists.txt | 183 | +++ b/inference-engine/samples/CMakeLists.txt |
125 | @@ -126,7 +126,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") | 184 | @@ -126,11 +126,10 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") |
126 | add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL) | 185 | add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL) |
127 | set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) | 186 | set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) |
128 | endfunction() | 187 | endfunction() |
@@ -130,9 +189,28 @@ index dfe9f2303d..6bc44019fe 100644 | |||
130 | + #add_gflags() | 189 | + #add_gflags() |
131 | endif() | 190 | endif() |
132 | 191 | ||
133 | if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") | 192 | if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib") |
193 | - add_subdirectory(thirdparty/zlib EXCLUDE_FROM_ALL) | ||
194 | endif() | ||
195 | |||
196 | if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cnpy") | ||
197 | diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt | ||
198 | index e8ed1a5c4c..2fcb0bed4a 100644 | ||
199 | --- a/inference-engine/src/inference_engine/CMakeLists.txt | ||
200 | +++ b/inference-engine/src/inference_engine/CMakeLists.txt | ||
201 | @@ -290,8 +290,8 @@ configure_package_config_file("${InferenceEngine_SOURCE_DIR}/cmake/templates/Inf | ||
202 | INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}" | ||
203 | PATH_VARS ${PATH_VARS}) | ||
204 | |||
205 | -set(IE_INCLUDE_DIR "include") | ||
206 | -set(IE_NGRAPH_DIR "../ngraph/cmake") | ||
207 | +set(IE_INCLUDE_DIR "../../include") | ||
208 | +set(IE_NGRAPH_DIR "ngraph") | ||
209 | set(IE_TBB_DIR "${IE_TBB_DIR_INSTALL}") | ||
210 | set(IE_PARALLEL_CMAKE "share/ie_parallel.cmake") | ||
211 | |||
134 | diff --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 | 212 | diff --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 |
135 | index 6e09201f1e..2d2e3524a5 100644 | 213 | index 5e8643dc5d..031557efc3 100644 |
136 | --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | 214 | --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt |
137 | +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt | 215 | +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt |
138 | @@ -43,7 +43,7 @@ function(add_gtest_libraries) | 216 | @@ -43,7 +43,7 @@ function(add_gtest_libraries) |
@@ -154,7 +232,7 @@ index 6e09201f1e..2d2e3524a5 100644 | |||
154 | 232 | ||
155 | set(TARGET_NAME commonTestUtils) | 233 | set(TARGET_NAME commonTestUtils) |
156 | diff --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 | 234 | diff --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 |
157 | index ab956218aa..233eb5ea46 100644 | 235 | index 7c1d89eabf..2fbd8fc324 100644 |
158 | --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | 236 | --- a/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt |
159 | +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt | 237 | +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt |
160 | @@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine) | 238 | @@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine) |
@@ -168,7 +246,7 @@ index ab956218aa..233eb5ea46 100644 | |||
168 | addIeTarget( | 246 | addIeTarget( |
169 | NAME ${TARGET_NAME} | 247 | NAME ${TARGET_NAME} |
170 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt | 248 | diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt |
171 | index 9a6a9209f1..eda6a64161 100644 | 249 | index f028ebdd8a..9c5bd53466 100644 |
172 | --- a/inference-engine/thirdparty/CMakeLists.txt | 250 | --- a/inference-engine/thirdparty/CMakeLists.txt |
173 | +++ b/inference-engine/thirdparty/CMakeLists.txt | 251 | +++ b/inference-engine/thirdparty/CMakeLists.txt |
174 | @@ -62,14 +62,13 @@ else() | 252 | @@ -62,14 +62,13 @@ else() |
@@ -188,6 +266,68 @@ index 9a6a9209f1..eda6a64161 100644 | |||
188 | 266 | ||
189 | if (NOT USE_SYSTEM_PUGIXML) | 267 | if (NOT USE_SYSTEM_PUGIXML) |
190 | set_target_properties(pugixml PROPERTIES FOLDER thirdparty) | 268 | set_target_properties(pugixml PROPERTIES FOLDER thirdparty) |
269 | diff --git a/ngraph/python/CMakeLists.txt b/ngraph/python/CMakeLists.txt | ||
270 | index 501bfffb4b..b45612c19c 100644 | ||
271 | --- a/ngraph/python/CMakeLists.txt | ||
272 | +++ b/ngraph/python/CMakeLists.txt | ||
273 | @@ -17,17 +17,7 @@ endif() | ||
274 | |||
275 | include(FetchContent) | ||
276 | |||
277 | -FetchContent_Declare( | ||
278 | - pybind11 | ||
279 | - GIT_REPOSITORY "https://github.com/pybind/pybind11.git" | ||
280 | - GIT_TAG "v2.5.0" | ||
281 | -) | ||
282 | - | ||
283 | -FetchContent_GetProperties(pybind11) | ||
284 | -if(NOT pybind11_POPULATED) | ||
285 | - FetchContent_Populate(pybind11) | ||
286 | - add_subdirectory(${pybind11_SOURCE_DIR} ${pybind11_BINARY_DIR}) | ||
287 | -endif() | ||
288 | +add_subdirectory(pybind11) | ||
289 | |||
290 | # PYTHON_VERSION_MAJOR and PYTHON_VERSION_MINOR are defined inside pybind11 | ||
291 | set(PYTHON_VERSION python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) | ||
292 | diff --git a/tests/fuzz/src/CMakeLists.txt b/tests/fuzz/src/CMakeLists.txt | ||
293 | index b9400d9e7e..669938526c 100644 | ||
294 | --- a/tests/fuzz/src/CMakeLists.txt | ||
295 | +++ b/tests/fuzz/src/CMakeLists.txt | ||
296 | @@ -10,7 +10,6 @@ add_custom_target(fuzz) | ||
297 | FILE(GLOB tests "*-fuzzer.cc") | ||
298 | |||
299 | add_subdirectory(../../../thirdparty/cnpy ${CMAKE_CURRENT_BINARY_DIR}/cnpy) | ||
300 | -add_subdirectory(../../../thirdparty/zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib) | ||
301 | |||
302 | foreach(test_source ${tests}) | ||
303 | get_filename_component(test_name ${test_source} NAME_WE) | ||
304 | diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt | ||
305 | index 2c6b656408..4e86bd21ef 100644 | ||
306 | --- a/thirdparty/CMakeLists.txt | ||
307 | +++ b/thirdparty/CMakeLists.txt | ||
308 | @@ -5,6 +5,5 @@ | ||
309 | add_subdirectory(ittapi) | ||
310 | add_subdirectory(itt_collector) | ||
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) | ||
315 | diff --git a/thirdparty/cnpy/CMakeLists.txt b/thirdparty/cnpy/CMakeLists.txt | ||
316 | index 5571cd5f78..e30604927a 100644 | ||
317 | --- a/thirdparty/cnpy/CMakeLists.txt | ||
318 | +++ b/thirdparty/cnpy/CMakeLists.txt | ||
319 | @@ -14,8 +14,8 @@ if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC") | ||
320 | target_compile_options(${TARGET_NAME} PUBLIC -Wno-unused-variable) | ||
321 | endif() | ||
322 | |||
323 | -target_link_libraries(${TARGET_NAME} PUBLIC zlib) | ||
324 | +target_link_libraries(${TARGET_NAME} PUBLIC z) | ||
325 | target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" | ||
326 | "${CMAKE_CURRENT_SOURCE_DIR}/..") | ||
327 | |||
328 | -set_target_properties(cnpy PROPERTIES FOLDER thirdparty) | ||
329 | \ No newline at end of file | ||
330 | +set_target_properties(cnpy PROPERTIES FOLDER thirdparty) | ||
191 | -- | 331 | -- |
192 | 2.29.0 | 332 | 2.32.0 |
193 | 333 | ||