From 7f04723d2524ccdeeed0647bb183a5aed7fd7c33 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Sun, 10 Jan 2021 18:21:13 +0300 Subject: [PATCH] Fixed install location for MODULE library type (#3752) --- cmake/developer_package/plugins/plugins.cmake | 2 +- inference-engine/src/preprocessing/CMakeLists.txt | 2 +- inference-engine/src/readers/ir_reader/CMakeLists.txt | 2 +- inference-engine/src/readers/ir_reader_v7/CMakeLists.txt | 1 + inference-engine/src/readers/onnx_reader/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/developer_package/plugins/plugins.cmake b/cmake/developer_package/plugins/plugins.cmake index c3aad14bab6..a66d2568d98 100644 --- a/cmake/developer_package/plugins/plugins.cmake +++ b/cmake/developer_package/plugins/plugins.cmake @@ -106,7 +106,7 @@ function(ie_add_plugin) install(TARGETS ${IE_PLUGIN_NAME} RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component} - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ${install_component}) + LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ${install_component}) endif() endfunction() diff --git a/inference-engine/src/preprocessing/CMakeLists.txt b/inference-engine/src/preprocessing/CMakeLists.txt index 9e3f864f08c..f4f7a828e19 100644 --- a/inference-engine/src/preprocessing/CMakeLists.txt +++ b/inference-engine/src/preprocessing/CMakeLists.txt @@ -185,4 +185,4 @@ ie_developer_export_targets(${TARGET_NAME}) install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) + LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) diff --git a/inference-engine/src/readers/ir_reader/CMakeLists.txt b/inference-engine/src/readers/ir_reader/CMakeLists.txt index bf6543efa89..7721b7df6d9 100644 --- a/inference-engine/src/readers/ir_reader/CMakeLists.txt +++ b/inference-engine/src/readers/ir_reader/CMakeLists.txt @@ -49,4 +49,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) + LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core) diff --git a/inference-engine/src/readers/ir_reader_v7/CMakeLists.txt b/inference-engine/src/readers/ir_reader_v7/CMakeLists.txt index 53ebe0bc7b4..20788d11b6d 100644 --- a/inference-engine/src/readers/ir_reader_v7/CMakeLists.txt +++ b/inference-engine/src/readers/ir_reader_v7/CMakeLists.txt @@ -41,6 +41,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL if(WIN32) set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_PDB_NAME ${TARGET_NAME}) endif() + # code style add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) diff --git a/inference-engine/src/readers/onnx_reader/CMakeLists.txt b/inference-engine/src/readers/onnx_reader/CMakeLists.txt index 483a98e6e8c..0a14e8cf84b 100644 --- a/inference-engine/src/readers/onnx_reader/CMakeLists.txt +++ b/inference-engine/src/readers/onnx_reader/CMakeLists.txt @@ -38,5 +38,5 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME}) install(TARGETS ${TARGET_NAME} RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core - LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core) + LIBRARY DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core)