summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support/opencv/files
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch54
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch193
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch36
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch30
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch261
5 files changed, 0 insertions, 574 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch
deleted file mode 100644
index 3130fb88..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-dont-install-licenses-and-version-file.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From c6fa6f32077ab554839d6e1e5b46d0778c17b8b1 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Tue, 9 Jun 2020 11:35:59 +0800
4Subject: [PATCH] don't install licenses and version
5
6Upstream-Status: Inappropriate
7
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9---
10 ngraph/CMakeLists.txt | 6 ++----
11 ngraph/test/runtime/CMakeLists.txt | 2 ++
12 2 files changed, 4 insertions(+), 4 deletions(-)
13
14diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
15index 6163c01e4a..74c479c071 100644
16--- a/ngraph/CMakeLists.txt
17+++ b/ngraph/CMakeLists.txt
18@@ -353,7 +353,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
19 install(EXPORT ngraphTargets
20 FILE ngraphTargets.cmake
21 NAMESPACE ngraph::
22- DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake
23+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
24 COMPONENT ngraph)
25 endif()
26
27@@ -367,7 +367,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE)
28
29 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake
30 ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake
31- DESTINATION ${NGRAPH_COMPONENT_PREFIX}cmake
32+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph
33 COMPONENT ngraph)
34 endif()
35
36@@ -386,5 +386,3 @@ add_subdirectory(test)
37 if (NGRAPH_PYTHON_BUILD_ENABLE)
38 add_subdirectory(python)
39 endif()
40-
41-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION DESTINATION "${NGRAPH_COMPONENT_PREFIX}." COMPONENT ngraph)
42diff --git a/ngraph/test/runtime/CMakeLists.txt b/ngraph/test/runtime/CMakeLists.txt
43index 2943722acc..a2ccdd11de 100644
44--- a/ngraph/test/runtime/CMakeLists.txt
45+++ b/ngraph/test/runtime/CMakeLists.txt
46@@ -79,3 +79,5 @@ target_include_directories(ngraph_backend PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
47
48 add_subdirectory(interpreter)
49 add_subdirectory(ie)
50+
51+install(TARGETS ngraph_backend DESTINATION ${NGRAPH_INSTALL_LIB})
52--
532.30.2
54
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 822ab1cc..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-inference-engine-use-system-installed-packages.patch
+++ /dev/null
@@ -1,193 +0,0 @@
1From ca4a2b824de61c182b46e28fce875370ce46d4e1 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 8 Apr 2021 14:19:51 +0800
4Subject: [PATCH] inference-engine: use system installed packages
5
6Use installed versions of ade, protobuf and tbb.
7
8Upstream-Status: Pending
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11---
12 cmake/dependencies.cmake | 19 -----------
13 inference-engine/CMakeLists.txt | 2 +-
14 inference-engine/cmake/dependencies.cmake | 34 -------------------
15 inference-engine/cmake/ie_parallel.cmake | 2 +-
16 inference-engine/samples/CMakeLists.txt | 2 +-
17 .../common_test_utils/CMakeLists.txt | 4 +--
18 .../unit_test_utils/CMakeLists.txt | 3 +-
19 inference-engine/thirdparty/CMakeLists.txt | 5 ++-
20 8 files changed, 7 insertions(+), 64 deletions(-)
21
22diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
23index aed7614734..f5baa6f86b 100644
24--- a/cmake/dependencies.cmake
25+++ b/cmake/dependencies.cmake
26@@ -7,23 +7,4 @@ set_temp_directory(TEMP "${IE_MAIN_SOURCE_DIR}")
27 if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
28 set(protoc_version "3.7.1")
29
30- RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
31- ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
32- TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64"
33- SHA256 "a1bedd5c05ca51e49f8f254faa3d7331e05b3a806c151fb111d582f154d0fee8"
34- )
35- debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})
36-
37- reset_deps_cache(SYSTEM_PROTOC)
38-
39- find_program(
40- SYSTEM_PROTOC
41- NAMES protoc
42- PATHS "${SYSTEM_PROTOC_ROOT}/bin"
43- NO_DEFAULT_PATH)
44- if(NOT SYSTEM_PROTOC)
45- message(FATAL_ERROR "[ONNX IMPORTER] Missing host protoc binary")
46- endif()
47-
48- update_deps_cache(SYSTEM_PROTOC "${SYSTEM_PROTOC}" "Path to host protoc for ONNX Importer")
49 endif()
50diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt
51index 95c657222e..20cbd5000b 100644
52--- a/inference-engine/CMakeLists.txt
53+++ b/inference-engine/CMakeLists.txt
54@@ -20,7 +20,7 @@ function(ie_developer_export_targets)
55 endfunction()
56
57 function(ie_developer_export)
58- set(all_dev_targets gflags ie_libraries)
59+ set(all_dev_targets ie_libraries)
60 foreach(component IN LISTS openvino_export_components)
61 export(TARGETS ${${component}} NAMESPACE IE::
62 APPEND FILE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
63diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake
64index 6fdfc6f3cd..c07bf0f3c8 100644
65--- a/inference-engine/cmake/dependencies.cmake
66+++ b/inference-engine/cmake/dependencies.cmake
67@@ -138,40 +138,6 @@ endif ()
68 if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
69 reset_deps_cache(TBBROOT TBB_DIR)
70
71- if (WIN32 AND X86_64)
72- #TODO: add target_path to be platform specific as well, to avoid following if
73- RESOLVE_DEPENDENCY(TBB
74- ARCHIVE_WIN "tbb2020_20200415_win.zip"
75- TARGET_PATH "${TEMP}/tbb"
76- ENVIRONMENT "TBBROOT"
77- SHA256 "f1c9b9e2861efdaa01552bd25312ccbc5feeb45551e5f91ae61e29221c5c1479")
78- elseif(ANDROID) # Should be before LINUX due LINUX is detected as well
79- RESOLVE_DEPENDENCY(TBB
80- ARCHIVE_ANDROID "tbb2020_20200404_android.tgz"
81- TARGET_PATH "${TEMP}/tbb"
82- ENVIRONMENT "TBBROOT"
83- SHA256 "f42d084224cc2d643314bd483ad180b081774608844000f132859fca3e9bf0ce")
84- elseif(LINUX AND X86_64)
85- RESOLVE_DEPENDENCY(TBB
86- ARCHIVE_LIN "tbb2020_20200415_lin_strip.tgz"
87- TARGET_PATH "${TEMP}/tbb"
88- SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008")
89- elseif(LINUX AND AARCH64)
90- RESOLVE_DEPENDENCY(TBB
91- ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz"
92- TARGET_PATH "${TEMP}/tbb_yocto"
93- ENVIRONMENT "TBBROOT"
94- SHA256 "321261ff2eda6d4568a473cb883262bce77a93dac599f7bd65d2918bdee4d75b")
95- elseif(APPLE AND X86_64)
96- RESOLVE_DEPENDENCY(TBB
97- ARCHIVE_MAC "tbb2020_20200404_mac.tgz"
98- TARGET_PATH "${TEMP}/tbb"
99- ENVIRONMENT "TBBROOT"
100- SHA256 "ad9cf52e657660058aa6c6844914bc0fc66241fec89a392d8b79a7ff69c3c7f6")
101- else()
102- message(FATAL_ERROR "TBB is not available on current platform")
103- endif()
104-
105 update_deps_cache(TBBROOT "${TBB}" "Path to TBB root folder")
106 update_deps_cache(TBB_DIR "${TBB}/cmake" "Path to TBB cmake folder")
107
108diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
109index f8988aa105..42fedd10c5 100644
110--- a/inference-engine/cmake/ie_parallel.cmake
111+++ b/inference-engine/cmake/ie_parallel.cmake
112@@ -6,7 +6,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
113 if (THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND)
114 find_package(TBB COMPONENTS tbb tbbmalloc)
115 set("TBB_FOUND" ${TBB_FOUND} PARENT_SCOPE)
116- set("TBB_IMPORTED_TARGETS" ${TBB_IMPORTED_TARGETS} PARENT_SCOPE)
117+ set("TBB_IMPORTED_TARGETS" "tbb;tbbmalloc" PARENT_SCOPE)
118 set("TBB_VERSION" ${TBB_VERSION} PARENT_SCOPE)
119 if (TBB_FOUND)
120 if (TBB_VERSION VERSION_LESS 2020)
121diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
122index dfe9f2303d..6bc44019fe 100644
123--- a/inference-engine/samples/CMakeLists.txt
124+++ b/inference-engine/samples/CMakeLists.txt
125@@ -126,7 +126,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags")
126 add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL)
127 set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty)
128 endfunction()
129- add_gflags()
130+ #add_gflags()
131 endif()
132
133 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
134diff --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
135index 6e09201f1e..2d2e3524a5 100644
136--- 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
138@@ -43,7 +43,7 @@ function(add_gtest_libraries)
139 PROPERTIES FOLDER thirdparty)
140 endfunction()
141
142-add_gtest_libraries()
143+#add_gtest_libraries()
144
145 if (MSVC)
146 set(PUGI pugixml_mt)
147@@ -52,8 +52,6 @@ else ()
148 endif ()
149
150 list(APPEND EXPORT_DEPENDENCIES
151- gtest
152- gtest_main
153 )
154
155 set(TARGET_NAME commonTestUtils)
156diff --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
157index ab956218aa..233eb5ea46 100644
158--- 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
160@@ -8,8 +8,7 @@ add_subdirectory(mocks/mock_engine)
161
162 list(APPEND EXPORT_DEPENDENCIES
163 commonTestUtils_s
164- inference_engine_s
165- gmock)
166+ inference_engine_s)
167
168 addIeTarget(
169 NAME ${TARGET_NAME}
170diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt
171index 9a6a9209f1..eda6a64161 100644
172--- a/inference-engine/thirdparty/CMakeLists.txt
173+++ b/inference-engine/thirdparty/CMakeLists.txt
174@@ -62,14 +62,13 @@ else()
175 target_include_directories(pugixml INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pugixml/src>")
176 endif()
177
178-add_subdirectory(ade EXCLUDE_FROM_ALL)
179 add_subdirectory(fluid/modules/gapi)
180
181-set_target_properties(ade fluid PROPERTIES FOLDER thirdparty)
182+set_target_properties(fluid PROPERTIES FOLDER thirdparty)
183
184 # developer package
185
186-openvino_developer_export_targets(COMPONENT openvino_common TARGETS ade fluid)
187+openvino_developer_export_targets(COMPONENT openvino_common TARGETS fluid)
188
189 if (NOT USE_SYSTEM_PUGIXML)
190 set_target_properties(pugixml PROPERTIES FOLDER thirdparty)
191--
1922.29.0
193
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch
deleted file mode 100644
index 4b83a948..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-plugin_api-fix-build-with-gcc-11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 0ecaaf9098dc22b5503dfbce5cf629525e1dd237 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Fri, 7 May 2021 14:30:03 +0800
4Subject: [PATCH] plugin_api: fix build with gcc 11
5
6Some C++ Standard Library headers have been changed in gcc 11 to no
7longer include other headers that they do need to depend on.
8
9Include exception explicitly to avoid:
10
11| inference-engine/src/plugin_api/ie_system_conf.h:21:31: error: 'exception_ptr' in namespace 'std' does not name a type; did you mean 'exception'?
12| 21 | INFERENCE_ENGINE_API_CPP(std::exception_ptr&) CurrentException();
13| | ^~~~~~~~~~~~~
14
15Upstream-Status: Submitted [https://github.com/openvinotoolkit/openvino/pull/5546]
16
17Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
18---
19 inference-engine/src/plugin_api/ie_system_conf.h | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/inference-engine/src/plugin_api/ie_system_conf.h b/inference-engine/src/plugin_api/ie_system_conf.h
23index c0e4cbb8b..56d5fb488 100644
24--- a/inference-engine/src/plugin_api/ie_system_conf.h
25+++ b/inference-engine/src/plugin_api/ie_system_conf.h
26@@ -11,6 +11,7 @@
27
28 #include "ie_api.h"
29 #include <vector>
30+#include <exception>
31
32 namespace InferenceEngine {
33
34--
352.30.2
36
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch
deleted file mode 100644
index a4e58b8e..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-cldNN-disable-Werror.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 65014a2703a6a3892fdebc86fe1c5a3a589dbf56 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 10 Jun 2020 09:45:48 +0800
4Subject: [PATCH 2/5] cldNN: disable Werror
5
6Don't treat warnings as errors. This just leads to failures every time
7we upgrade the compiler.
8
9Upstream-Status: Inappropriate
10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13 inference-engine/thirdparty/clDNN/CMakeLists.txt | 1 -
14 1 file changed, 1 deletion(-)
15
16diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt
17index 4b444eca..8610b9b8 100644
18--- a/inference-engine/thirdparty/clDNN/CMakeLists.txt
19+++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt
20@@ -770,7 +770,6 @@ foreach(__CLDNN_CompilerFlagName IN ITEMS "CMAKE_CXX_FLAGS" "CMAKE_C_FLAGS")
21 MultiProcessorCompilation
22 DeadCodeEliminate
23 ExtensionsEnabled
24- TreatWarnAsErrorEnabled
25 WarnLevel4
26 NoFastMath
27 StackProtector
28--
292.25.4
30
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
deleted file mode 100644
index 631b1839..00000000
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
+++ /dev/null
@@ -1,261 +0,0 @@
1From 21453439cd6d89058710e868f05727502e556f99 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 11 Jun 2020 14:24:04 +0800
4Subject: [PATCH] cmake installation fixes
5
6Make sure that libraries/samples/binaries are installed correctly.
7
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9---
10 CMakeLists.txt | 15 ---------------
11 cmake/developer_package/IEDevScriptsConfig.cmake | 2 +-
12 cmake/developer_package/packaging.cmake | 8 +++++---
13 cmake/developer_package/plugins/plugins.cmake | 2 +-
14 .../samples/common/opencv_c_wraper/CMakeLists.txt | 2 ++
15 inference-engine/samples/CMakeLists.txt | 4 +++-
16 .../samples/common/format_reader/CMakeLists.txt | 2 ++
17 .../src/inference_engine/CMakeLists.txt | 4 ++--
18 inference-engine/src/preprocessing/CMakeLists.txt | 2 +-
19 .../src/readers/ir_reader/CMakeLists.txt | 2 +-
20 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +-
21 inference-engine/tests/unit/cpu/CMakeLists.txt | 2 ++
22 .../tests/unit/inference_engine/CMakeLists.txt | 2 ++
23 inference-engine/tests/unit/vpu/CMakeLists.txt | 2 ++
24 .../tools/compile_tool/CMakeLists.txt | 2 +-
25 15 files changed, 26 insertions(+), 27 deletions(-)
26
27diff --git a/CMakeLists.txt b/CMakeLists.txt
28index e72f2b61f1..2c22827e2d 100644
29--- a/CMakeLists.txt
30+++ b/CMakeLists.txt
31@@ -105,7 +105,6 @@ function(build_ngraph)
32 ie_cpack_add_component(ngraph)
33
34 set(SDL_cmake_included ON)
35- set(NGRAPH_COMPONENT_PREFIX "deployment_tools/ngraph/")
36 add_subdirectory(ngraph)
37 set(NGRAPH_LIBRARIES ngraph PARENT_SCOPE)
38 set(NGRAPH_REF_LIBRARIES ngraph_reference PARENT_SCOPE)
39@@ -174,12 +173,8 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}"
40
41 # install setupvars
42
43-ie_cpack_add_component(setupvars REQUIRED)
44
45 if(UNIX)
46- install(PROGRAMS scripts/setupvars/setupvars.sh
47- DESTINATION bin
48- COMPONENT setupvars)
49 elseif(WIN32)
50 install(PROGRAMS scripts/setupvars/setupvars.bat
51 DESTINATION bin
52@@ -189,22 +184,12 @@ endif()
53 # install install_dependencies
54
55 if(UNIX)
56- ie_cpack_add_component(install_dependencies REQUIRED)
57- install(DIRECTORY scripts/install_dependencies/
58- DESTINATION install_dependencies
59- COMPONENT install_dependencies)
60 endif()
61
62 # install files for demo
63
64-ie_cpack_add_component(demo_scripts REQUIRED DEPENDS core)
65
66 if(UNIX)
67- install(DIRECTORY scripts/demo/
68- DESTINATION deployment_tools/demo
69- COMPONENT demo_scripts
70- USE_SOURCE_PERMISSIONS
71- PATTERN *.bat EXCLUDE)
72 elseif(WIN32)
73 install(DIRECTORY scripts/demo/
74 DESTINATION deployment_tools/demo
75diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake
76index ed6971fd37..10817d3a75 100644
77--- a/cmake/developer_package/IEDevScriptsConfig.cmake
78+++ b/cmake/developer_package/IEDevScriptsConfig.cmake
79@@ -121,7 +121,7 @@ if(NOT DEFINED OUTPUT_ROOT)
80 if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR)
81 message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined")
82 endif()
83- set(OUTPUT_ROOT ${OpenVINO_MAIN_SOURCE_DIR})
84+ set(OUTPUT_ROOT ${CMAKE_CURRENT_BINARY_DIR})
85 endif()
86
87 # Enable postfixes for Debug/Release builds
88diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake
89index b846bf732d..7a0022968c 100644
90--- a/cmake/developer_package/packaging.cmake
91+++ b/cmake/developer_package/packaging.cmake
92@@ -4,7 +4,9 @@
93 include(CPackComponent)
94 unset(IE_CPACK_COMPONENTS_ALL CACHE)
95
96-set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
97+if (NOT DEFINED IE_CPACK_IE_DIR)
98+ set(IE_CPACK_IE_DIR deployment_tools/inference_engine)
99+endif()
100
101 #
102 # ie_cpack_set_library_dir()
103@@ -17,8 +19,8 @@ function(ie_cpack_set_library_dir)
104 set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
105 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
106 else()
107- set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
108- set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
109+ set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
110+ set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
111 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
112 endif()
113 endfunction()
114diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake
115index a66d2568d9..c3aad14bab 100644
116--- a/cmake/developer_package/plugins/plugins.cmake
117+++ b/cmake/developer_package/plugins/plugins.cmake
118@@ -106,7 +106,7 @@ function(ie_add_plugin)
119
120 install(TARGETS ${IE_PLUGIN_NAME}
121 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component}
122- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component})
123+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ${install_component})
124 endif()
125 endfunction()
126
127diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt
128index aff7229c9f..f45a215f68 100644
129--- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt
130+++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt
131@@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples)
132 if(COMMAND add_cpplint_target)
133 add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
134 endif()
135+
136+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
137diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
138index 6bc44019fe..ca5ab34704 100644
139--- a/inference-engine/samples/CMakeLists.txt
140+++ b/inference-engine/samples/CMakeLists.txt
141@@ -33,7 +33,7 @@ endif()
142
143 if(IE_MAIN_SOURCE_DIR)
144 # in case if samples are built from IE repo
145- set(IE_MAIN_SAMPLES_DIR ${OpenVINO_MAIN_SOURCE_DIR})
146+ set(IE_MAIN_SAMPLES_DIR ${CMAKE_BINARY_DIR})
147 # hint for find_package(InferenceEngine in the samples folder)
148 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
149 # hint for find_package(ngraph in the samples folder)
150@@ -251,6 +251,8 @@ macro(ie_add_sample)
151 add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME}
152 CUSTOM_FILTERS ${custom_filters})
153 endif()
154+
155+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
156 endmacro()
157
158 # collect all samples subdirectories
159diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
160index c5c5449677..06ecab13b5 100644
161--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
162+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
163@@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
164
165 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}
166 FOLDER cpp_samples)
167+
168+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
169diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
170index 1ea3227631..aa64718940 100644
171--- a/inference-engine/src/inference_engine/CMakeLists.txt
172+++ b/inference-engine/src/inference_engine/CMakeLists.txt
173@@ -254,8 +254,8 @@ install(TARGETS ${TARGET_NAME}
174 install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
175 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
176 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
177- DESTINATION ${IE_CPACK_IE_DIR}/share
178+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
179 COMPONENT core)
180 install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
181- DESTINATION ${IE_CPACK_RUNTIME_PATH}
182+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
183 COMPONENT core)
184diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt
185index 973fafcbf5..81aea3471a 100644
186--- a/inference-engine/src/preprocessing/CMakeLists.txt
187+++ b/inference-engine/src/preprocessing/CMakeLists.txt
188@@ -185,4 +185,4 @@ ie_developer_export_targets(${TARGET_NAME})
189 install(TARGETS ${TARGET_NAME}
190 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
191 ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
192- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
193+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
194diff --git a/inference-engine/src/readers/ir_reader/CMakeLists.txt b/inference-engine/src/readers/ir_reader/CMakeLists.txt
195index 7721b7df6d..bf6543efa8 100644
196--- a/inference-engine/src/readers/ir_reader/CMakeLists.txt
197+++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt
198@@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
199 install(TARGETS ${TARGET_NAME}
200 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
201 ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
202- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
203+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
204diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
205index d8a5f2ec1d..2db7ddea6f 100644
206--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
207+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
208@@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
209 # install
210 if (LINUX)
211 install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
212- DESTINATION ${IE_CPACK_IE_DIR}/external
213+ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
214 COMPONENT myriad)
215 endif()
216diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
217index c9a92b4857..2b4fcc4d01 100644
218--- a/inference-engine/tests/unit/cpu/CMakeLists.txt
219+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
220@@ -25,3 +25,5 @@ addIeTargetTest(
221 ie_faster_build(${TARGET_NAME}
222 UNITY
223 )
224+
225+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
226diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
227index 1d9515f540..c81cb2ed79 100644
228--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
229+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
230@@ -26,3 +26,5 @@ addIeTargetTest(
231 LABELS
232 IE
233 )
234+
235+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
236diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt
237index 5be30a3092..6a01e280ae 100644
238--- a/inference-engine/tests/unit/vpu/CMakeLists.txt
239+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
240@@ -35,3 +35,5 @@ addIeTargetTest(
241 VPU
242 MYRIAD
243 )
244+
245+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
246diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt
247index 58614d3ced..9dfa068e4d 100644
248--- a/inference-engine/tools/compile_tool/CMakeLists.txt
249+++ b/inference-engine/tools/compile_tool/CMakeLists.txt
250@@ -49,7 +49,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
251 # install
252
253 install(TARGETS compile_tool
254- RUNTIME DESTINATION deployment_tools/tools/compile_tool
255+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
256 COMPONENT core)
257
258 install(FILES README.md
259--
2602.29.0
261
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-06 00:53:09 +0000