summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch215
1 files changed, 140 insertions, 75 deletions
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
index 631b1839..145f2585 100644
--- 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
@@ -1,4 +1,4 @@
1From 21453439cd6d89058710e868f05727502e556f99 Mon Sep 17 00:00:00 2001 1From 626184cf0e8c97b23cf0e7be4fb3e73f7e6748ee Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 11 Jun 2020 14:24:04 +0800 3Date: Thu, 11 Jun 2020 14:24:04 +0800
4Subject: [PATCH] cmake installation fixes 4Subject: [PATCH] cmake installation fixes
@@ -7,41 +7,34 @@ Make sure that libraries/samples/binaries are installed correctly.
7 7
8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 8Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9--- 9---
10 CMakeLists.txt | 15 --------------- 10 CMakeLists.txt | 15 --------
11 cmake/developer_package/IEDevScriptsConfig.cmake | 2 +- 11 .../IEDevScriptsConfig.cmake | 2 +-
12 cmake/developer_package/packaging.cmake | 8 +++++--- 12 cmake/developer_package/packaging.cmake | 8 +++--
13 cmake/developer_package/plugins/plugins.cmake | 2 +- 13 cmake/developer_package/plugins/plugins.cmake | 2 +-
14 .../samples/common/opencv_c_wraper/CMakeLists.txt | 2 ++ 14 .../common/opencv_c_wrapper/CMakeLists.txt | 2 ++
15 inference-engine/samples/CMakeLists.txt | 4 +++- 15 inference-engine/samples/CMakeLists.txt | 4 ++-
16 .../samples/common/format_reader/CMakeLists.txt | 2 ++ 16 .../common/format_reader/CMakeLists.txt | 4 ++-
17 .../src/inference_engine/CMakeLists.txt | 4 ++-- 17 .../src/inference_engine/CMakeLists.txt | 35 ++-----------------
18 inference-engine/src/preprocessing/CMakeLists.txt | 2 +- 18 .../src/preprocessing/CMakeLists.txt | 2 +-
19 .../src/readers/ir_reader/CMakeLists.txt | 2 +- 19 .../src/readers/ir_reader/CMakeLists.txt | 2 +-
20 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +- 20 .../src/vpu/myriad_plugin/CMakeLists.txt | 2 +-
21 inference-engine/tests/unit/cpu/CMakeLists.txt | 2 ++ 21 .../tests/unit/cpu/CMakeLists.txt | 2 ++
22 .../tests/unit/inference_engine/CMakeLists.txt | 2 ++ 22 .../unit/inference_engine/CMakeLists.txt | 2 ++
23 inference-engine/tests/unit/vpu/CMakeLists.txt | 2 ++ 23 .../tests/unit/vpu/CMakeLists.txt | 2 ++
24 .../tools/compile_tool/CMakeLists.txt | 2 +- 24 .../tools/compile_tool/CMakeLists.txt | 2 +-
25 15 files changed, 26 insertions(+), 27 deletions(-) 25 ngraph/CMakeLists.txt | 8 ++---
26 16 files changed, 32 insertions(+), 62 deletions(-)
26 27
27diff --git a/CMakeLists.txt b/CMakeLists.txt 28diff --git a/CMakeLists.txt b/CMakeLists.txt
28index e72f2b61f1..2c22827e2d 100644 29index e0706a72e8..7920de9a42 100644
29--- a/CMakeLists.txt 30--- a/CMakeLists.txt
30+++ b/CMakeLists.txt 31+++ b/CMakeLists.txt
31@@ -105,7 +105,6 @@ function(build_ngraph) 32@@ -180,12 +180,7 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}"
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 33
41 # install setupvars 34 # install setupvars
42 35
43-ie_cpack_add_component(setupvars REQUIRED) 36-ie_cpack_add_component(setupvars REQUIRED)
44 37-
45 if(UNIX) 38 if(UNIX)
46- install(PROGRAMS scripts/setupvars/setupvars.sh 39- install(PROGRAMS scripts/setupvars/setupvars.sh
47- DESTINATION bin 40- DESTINATION bin
@@ -49,7 +42,7 @@ index e72f2b61f1..2c22827e2d 100644
49 elseif(WIN32) 42 elseif(WIN32)
50 install(PROGRAMS scripts/setupvars/setupvars.bat 43 install(PROGRAMS scripts/setupvars/setupvars.bat
51 DESTINATION bin 44 DESTINATION bin
52@@ -189,22 +184,12 @@ endif() 45@@ -195,22 +190,12 @@ endif()
53 # install install_dependencies 46 # install install_dependencies
54 47
55 if(UNIX) 48 if(UNIX)
@@ -61,7 +54,7 @@ index e72f2b61f1..2c22827e2d 100644
61 54
62 # install files for demo 55 # install files for demo
63 56
64-ie_cpack_add_component(demo_scripts REQUIRED DEPENDS core) 57-ie_cpack_add_component(demo_scripts DEPENDS core)
65 58
66 if(UNIX) 59 if(UNIX)
67- install(DIRECTORY scripts/demo/ 60- install(DIRECTORY scripts/demo/
@@ -73,10 +66,10 @@ index e72f2b61f1..2c22827e2d 100644
73 install(DIRECTORY scripts/demo/ 66 install(DIRECTORY scripts/demo/
74 DESTINATION deployment_tools/demo 67 DESTINATION deployment_tools/demo
75diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake 68diff --git a/cmake/developer_package/IEDevScriptsConfig.cmake b/cmake/developer_package/IEDevScriptsConfig.cmake
76index ed6971fd37..10817d3a75 100644 69index 0e1fe76db2..97867a24f8 100644
77--- a/cmake/developer_package/IEDevScriptsConfig.cmake 70--- a/cmake/developer_package/IEDevScriptsConfig.cmake
78+++ b/cmake/developer_package/IEDevScriptsConfig.cmake 71+++ b/cmake/developer_package/IEDevScriptsConfig.cmake
79@@ -121,7 +121,7 @@ if(NOT DEFINED OUTPUT_ROOT) 72@@ -124,7 +124,7 @@ if(NOT DEFINED OUTPUT_ROOT)
80 if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR) 73 if(NOT DEFINED OpenVINO_MAIN_SOURCE_DIR)
81 message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined") 74 message(FATAL_ERROR "OpenVINO_MAIN_SOURCE_DIR is not defined")
82 endif() 75 endif()
@@ -86,10 +79,10 @@ index ed6971fd37..10817d3a75 100644
86 79
87 # Enable postfixes for Debug/Release builds 80 # Enable postfixes for Debug/Release builds
88diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake 81diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake
89index b846bf732d..7a0022968c 100644 82index 2b5e945b17..adc4bef0bc 100644
90--- a/cmake/developer_package/packaging.cmake 83--- a/cmake/developer_package/packaging.cmake
91+++ b/cmake/developer_package/packaging.cmake 84+++ b/cmake/developer_package/packaging.cmake
92@@ -4,7 +4,9 @@ 85@@ -5,7 +5,9 @@
93 include(CPackComponent) 86 include(CPackComponent)
94 unset(IE_CPACK_COMPONENTS_ALL CACHE) 87 unset(IE_CPACK_COMPONENTS_ALL CACHE)
95 88
@@ -100,7 +93,7 @@ index b846bf732d..7a0022968c 100644
100 93
101 # 94 #
102 # ie_cpack_set_library_dir() 95 # ie_cpack_set_library_dir()
103@@ -17,8 +19,8 @@ function(ie_cpack_set_library_dir) 96@@ -18,8 +20,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) 97 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) 98 set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
106 else() 99 else()
@@ -112,10 +105,10 @@ index b846bf732d..7a0022968c 100644
112 endif() 105 endif()
113 endfunction() 106 endfunction()
114diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake 107diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake
115index a66d2568d9..c3aad14bab 100644 108index aae1dbb7fb..e6dac2a478 100644
116--- a/cmake/developer_package/plugins/plugins.cmake 109--- a/cmake/developer_package/plugins/plugins.cmake
117+++ b/cmake/developer_package/plugins/plugins.cmake 110+++ b/cmake/developer_package/plugins/plugins.cmake
118@@ -106,7 +106,7 @@ function(ie_add_plugin) 111@@ -124,7 +124,7 @@ function(ie_add_plugin)
119 112
120 install(TARGETS ${IE_PLUGIN_NAME} 113 install(TARGETS ${IE_PLUGIN_NAME}
121 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component} 114 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component}
@@ -124,18 +117,18 @@ index a66d2568d9..c3aad14bab 100644
124 endif() 117 endif()
125 endfunction() 118 endfunction()
126 119
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 120diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt
128index aff7229c9f..f45a215f68 100644 121index 45b2b3e9ed..55f7dfd214 100644
129--- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt 122--- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt
130+++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt 123+++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wrapper/CMakeLists.txt
131@@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples) 124@@ -28,3 +28,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples)
132 if(COMMAND add_cpplint_target) 125 if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT)
133 add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) 126 add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
134 endif() 127 endif()
135+ 128+
136+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) 129+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
137diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt 130diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
138index 6bc44019fe..ca5ab34704 100644 131index ae93857944..fba24c6fed 100644
139--- a/inference-engine/samples/CMakeLists.txt 132--- a/inference-engine/samples/CMakeLists.txt
140+++ b/inference-engine/samples/CMakeLists.txt 133+++ b/inference-engine/samples/CMakeLists.txt
141@@ -33,7 +33,7 @@ endif() 134@@ -33,7 +33,7 @@ endif()
@@ -147,9 +140,9 @@ index 6bc44019fe..ca5ab34704 100644
147 # hint for find_package(InferenceEngine in the samples folder) 140 # hint for find_package(InferenceEngine in the samples folder)
148 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}") 141 set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
149 # hint for find_package(ngraph in the samples folder) 142 # hint for find_package(ngraph in the samples folder)
150@@ -251,6 +251,8 @@ macro(ie_add_sample) 143@@ -256,6 +256,8 @@ macro(ie_add_sample)
151 add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME} 144 if(COMMAND add_clang_format_target AND NOT IE_SAMPLE_EXCLUDE_CLANG_FORMAT)
152 CUSTOM_FILTERS ${custom_filters}) 145 add_clang_format_target(${IE_SAMPLE_NAME}_clang FOR_SOURCES ${IE_SAMPLE_SOURCES} ${IE_SAMPLE_HEADERS})
153 endif() 146 endif()
154+ 147+
155+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin) 148+ install(TARGETS ${IE_SAMPLE_NAME} DESTINATION bin)
@@ -157,52 +150,105 @@ index 6bc44019fe..ca5ab34704 100644
157 150
158 # collect all samples subdirectories 151 # collect all samples subdirectories
159diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt 152diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
160index c5c5449677..06ecab13b5 100644 153index d75061e56c..a2f8bd6397 100644
161--- a/inference-engine/samples/common/format_reader/CMakeLists.txt 154--- a/inference-engine/samples/common/format_reader/CMakeLists.txt
162+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt 155+++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
163@@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" 156@@ -44,4 +44,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}
164 157
165 set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME} 158 if(COMMAND add_clang_format_target)
166 FOLDER cpp_samples) 159 add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
160-endif()
161\ No newline at end of file
162+endif()
167+ 163+
168+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}) 164+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 165diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
170index 1ea3227631..aa64718940 100644 166index 5d044e097c..103c187913 100644
171--- a/inference-engine/src/inference_engine/CMakeLists.txt 167--- a/inference-engine/src/inference_engine/CMakeLists.txt
172+++ b/inference-engine/src/inference_engine/CMakeLists.txt 168+++ b/inference-engine/src/inference_engine/CMakeLists.txt
173@@ -254,8 +254,8 @@ install(TARGETS ${TARGET_NAME} 169@@ -227,35 +227,6 @@ list(APPEND core_components ngraph)
174 install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake" 170 list(APPEND PATH_VARS "IE_INCLUDE_DIR" "IE_NGRAPH_DIR"
175 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake" 171 "IE_PARALLEL_CMAKE")
176 "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake" 172
177- DESTINATION ${IE_CPACK_IE_DIR}/share 173-if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND TBBROOT MATCHES ${TEMP})
178+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine 174- ie_cpack_add_component(tbb REQUIRED)
179 COMPONENT core) 175- list(APPEND core_components tbb)
176-
177- install(DIRECTORY "${TBB}/include"
178- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
179- COMPONENT tbb)
180- install(DIRECTORY "${TBB}/lib"
181- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
182- COMPONENT tbb)
183- if(EXISTS "${TBB}/bin")
184- install(DIRECTORY "${TBB}/bin"
185- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
186- COMPONENT tbb)
187- endif()
188- install(FILES "${TBB}/LICENSE"
189- DESTINATION ${IE_CPACK_IE_DIR}/external/tbb
190- COMPONENT tbb)
191-
192- set(IE_TBB_DIR_INSTALL "external/tbb/cmake")
193- set(IE_TBB_DIR "${TBB_DIR}")
194- list(APPEND PATH_VARS "IE_TBB_DIR")
195-
196- install(FILES "${TBB}/cmake/TBBConfig.cmake"
197- "${TBB}/cmake/TBBConfigVersion.cmake"
198- DESTINATION ${IE_CPACK_IE_DIR}/${IE_TBB_DIR_INSTALL}
199- COMPONENT tbb)
200-endif()
201-
202 # Install Inference Engine
203
204 ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
205@@ -270,7 +241,7 @@ install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets
206 LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
207
180 install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml 208 install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
181- DESTINATION ${IE_CPACK_RUNTIME_PATH} 209- DESTINATION ${IE_CPACK_RUNTIME_PATH}
182+ DESTINATION ${CMAKE_INSTALL_LIBDIR} 210+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
183 COMPONENT core) 211 COMPONENT core)
212
213 # Install cmake scripts
214@@ -278,7 +249,7 @@ install(FILES $<TARGET_FILE_DIR:${TARGET_NAME}>/plugins.xml
215 install(EXPORT InferenceEngineTargets
216 FILE InferenceEngineTargets.cmake
217 NAMESPACE IE::
218- DESTINATION ${IE_CPACK_IE_DIR}/share
219+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
220 COMPONENT core_dev)
221
222 set(IE_NGRAPH_DIR "${CMAKE_BINARY_DIR}/ngraph")
223@@ -307,5 +278,5 @@ configure_file("${IE_MAIN_SOURCE_DIR}/cmake/templates/InferenceEngineConfig-vers
224 install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake"
225 "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake"
226 "${InferenceEngine_SOURCE_DIR}/cmake/ie_parallel.cmake"
227- DESTINATION ${IE_CPACK_IE_DIR}/share
228+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/InferenceEngine
229 COMPONENT core_dev)
184diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt 230diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt
185index 973fafcbf5..81aea3471a 100644 231index f9548339d1..2670a04b60 100644
186--- a/inference-engine/src/preprocessing/CMakeLists.txt 232--- a/inference-engine/src/preprocessing/CMakeLists.txt
187+++ b/inference-engine/src/preprocessing/CMakeLists.txt 233+++ b/inference-engine/src/preprocessing/CMakeLists.txt
188@@ -185,4 +185,4 @@ ie_developer_export_targets(${TARGET_NAME}) 234@@ -184,4 +184,4 @@ ie_developer_export_targets(${TARGET_NAME})
235
189 install(TARGETS ${TARGET_NAME} 236 install(TARGETS ${TARGET_NAME}
190 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core 237 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) 238- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
193+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) 239+ 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 240diff --git a/inference-engine/src/readers/ir_reader/CMakeLists.txt b/inference-engine/src/readers/ir_reader/CMakeLists.txt
195index 7721b7df6d..bf6543efa8 100644 241index 6d2bd39f3c..0722702055 100644
196--- a/inference-engine/src/readers/ir_reader/CMakeLists.txt 242--- a/inference-engine/src/readers/ir_reader/CMakeLists.txt
197+++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt 243+++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt
198@@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) 244@@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
245
199 install(TARGETS ${TARGET_NAME} 246 install(TARGETS ${TARGET_NAME}
200 RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core 247 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) 248- LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)
203+ LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) 249+ 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 250diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
205index d8a5f2ec1d..2db7ddea6f 100644 251index a3e0182ed9..1b0e241485 100644
206--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt 252--- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
207+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt 253+++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
208@@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL 254@@ -55,6 +55,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
@@ -214,7 +260,7 @@ index d8a5f2ec1d..2db7ddea6f 100644
214 COMPONENT myriad) 260 COMPONENT myriad)
215 endif() 261 endif()
216diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt 262diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
217index c9a92b4857..2b4fcc4d01 100644 263index dfa8ce9d3f..88e7fbf67f 100644
218--- a/inference-engine/tests/unit/cpu/CMakeLists.txt 264--- a/inference-engine/tests/unit/cpu/CMakeLists.txt
219+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt 265+++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
220@@ -25,3 +25,5 @@ addIeTargetTest( 266@@ -25,3 +25,5 @@ addIeTargetTest(
@@ -224,7 +270,7 @@ index c9a92b4857..2b4fcc4d01 100644
224+ 270+
225+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) 271+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 272diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
227index 1d9515f540..c81cb2ed79 100644 273index 5c38c77b9b..927f93484f 100644
228--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt 274--- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
229+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt 275+++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
230@@ -26,3 +26,5 @@ addIeTargetTest( 276@@ -26,3 +26,5 @@ addIeTargetTest(
@@ -234,28 +280,47 @@ index 1d9515f540..c81cb2ed79 100644
234+ 280+
235+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) 281+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 282diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt
237index 5be30a3092..6a01e280ae 100644 283index fcb9f567bb..d4ac1952b8 100644
238--- a/inference-engine/tests/unit/vpu/CMakeLists.txt 284--- a/inference-engine/tests/unit/vpu/CMakeLists.txt
239+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt 285+++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
240@@ -35,3 +35,5 @@ addIeTargetTest( 286@@ -33,3 +33,5 @@ addIeTargetTest(
241 VPU 287 VPU
242 MYRIAD 288 MYRIAD
243 ) 289 )
244+ 290+
245+install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) 291+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 292diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt
247index 58614d3ced..9dfa068e4d 100644 293index 6e6f384289..a76ba55e64 100644
248--- a/inference-engine/tools/compile_tool/CMakeLists.txt 294--- a/inference-engine/tools/compile_tool/CMakeLists.txt
249+++ b/inference-engine/tools/compile_tool/CMakeLists.txt 295+++ b/inference-engine/tools/compile_tool/CMakeLists.txt
250@@ -49,7 +49,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) 296@@ -41,7 +41,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
251 # install 297 ie_cpack_add_component(core_tools DEPENDS core)
252 298
253 install(TARGETS compile_tool 299 install(TARGETS compile_tool
254- RUNTIME DESTINATION deployment_tools/tools/compile_tool 300- RUNTIME DESTINATION deployment_tools/tools/compile_tool
255+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} 301+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
256 COMPONENT core) 302 COMPONENT core_tools)
257 303
258 install(FILES README.md 304 install(FILES README.md
305diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt
306index 830fb3eb36..3093596e4a 100644
307--- a/ngraph/CMakeLists.txt
308+++ b/ngraph/CMakeLists.txt
309@@ -183,10 +183,10 @@ endif()
310 message(STATUS "Installation directory: ${CMAKE_INSTALL_PREFIX}")
311
312 # Destinations
313-set(NGRAPH_INSTALL_LIB "deployment_tools/ngraph/${CMAKE_INSTALL_LIBDIR}")
314-set(NGRAPH_INSTALL_INCLUDE "deployment_tools/ngraph/${CMAKE_INSTALL_INCLUDEDIR}")
315-set(NGRAPH_INSTALL_DOC "deployment_tools/ngraph/${CMAKE_INSTALL_DOCDIR}")
316-set(NGRAPH_INSTALL_BIN "deployment_tools/ngraph/${CMAKE_INSTALL_BINDIR}")
317+set(NGRAPH_INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}")
318+set(NGRAPH_INSTALL_INCLUDE "${CMAKE_INSTALL_INCLUDEDIR}")
319+set(NGRAPH_INSTALL_DOC "${CMAKE_INSTALL_DOCDIR}")
320+set(NGRAPH_INSTALL_BIN "${CMAKE_INSTALL_BINDIR}")
321
322 #-----------------------------------------------------------------------------------------------
323 # Compile Flags for nGraph...
259-- 324--
2602.29.0 3252.32.0
261 326
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-12 03:55:11 +0000