From 11af0bd904b11a2479ce0b27cc1737fcfdbe4de4 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 25 May 2021 02:31:15 +0300 Subject: [PATCH] CVS-56141 (#5746) * CVS-56141 * Added dev component for C API --- CMakeLists.txt | 1 + inference-engine/ie_bridges/c/src/CMakeLists.txt | 3 ++- inference-engine/src/inference_engine/CMakeLists.txt | 7 ++++--- ngraph/CMakeLists.txt | 4 ++-- ngraph/core/CMakeLists.txt | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 053d67ef8c1..7788252f207 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,6 +103,7 @@ function(build_ngraph) endif() ie_cpack_add_component(ngraph REQUIRED) + ie_cpack_add_component(ngraph_dev REQUIRED DEPENDS ngraph) set(SDL_cmake_included ON) add_subdirectory(ngraph) diff --git a/inference-engine/ie_bridges/c/src/CMakeLists.txt b/inference-engine/ie_bridges/c/src/CMakeLists.txt index 882e42c6a80..69760a52de9 100644 --- a/inference-engine/ie_bridges/c/src/CMakeLists.txt +++ b/inference-engine/ie_bridges/c/src/CMakeLists.txt @@ -32,6 +32,7 @@ export(TARGETS ${TARGET_NAME} NAMESPACE IE:: # install ie_cpack_add_component(core_c DEPENDS core) +ie_cpack_add_component(core_c_dev DEPENDS core_c) install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core_c @@ -40,4 +41,4 @@ install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets install(DIRECTORY ${InferenceEngine_C_API_SOURCE_DIR}/include/ DESTINATION ${IE_CPACK_IE_DIR}/include - COMPONENT core_c) + COMPONENT core_c_dev) diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt index de31d61a619..050396f3afe 100644 --- a/inference-engine/src/inference_engine/CMakeLists.txt +++ b/inference-engine/src/inference_engine/CMakeLists.txt @@ -259,9 +259,10 @@ endif() # Install Inference Engine ie_cpack_add_component(core REQUIRED DEPENDS ${core_components}) +ie_cpack_add_component(core_dev REQUIRED core ngraph_dev) install(DIRECTORY "${IE_MAIN_SOURCE_DIR}/include" DESTINATION ${IE_CPACK_IE_DIR} - COMPONENT core) + COMPONENT core_dev) install(TARGETS ${TARGET_NAME} EXPORT InferenceEngineTargets RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core @@ -278,7 +279,7 @@ install(EXPORT InferenceEngineTargets FILE InferenceEngineTargets.cmake NAMESPACE IE:: DESTINATION ${IE_CPACK_IE_DIR}/share - COMPONENT core) + COMPONENT core_dev) include(CMakePackageConfigHelpers) @@ -309,4 +310,4 @@ install(FILES "${CMAKE_BINARY_DIR}/share/InferenceEngineConfig.cmake" "${CMAKE_BINARY_DIR}/InferenceEngineConfig-version.cmake" "${InferenceEngine_SOURCE_DIR}/cmake/ie_parallel.cmake" DESTINATION ${IE_CPACK_IE_DIR}/share - COMPONENT core) + COMPONENT core_dev) diff --git a/ngraph/CMakeLists.txt b/ngraph/CMakeLists.txt index 6c721e5947a..8d5d41ffc48 100644 --- a/ngraph/CMakeLists.txt +++ b/ngraph/CMakeLists.txt @@ -265,7 +265,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) FILE ngraphTargets.cmake NAMESPACE ngraph:: DESTINATION "deployment_tools/ngraph/cmake" - COMPONENT ngraph) + COMPONENT ngraph_dev) endif() configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/share/ngraphConfig.cmake.in @@ -279,7 +279,7 @@ if (NGRAPH_EXPORT_TARGETS_ENABLE) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake DESTINATION "deployment_tools/ngraph/cmake" - COMPONENT ngraph) + COMPONENT ngraph_dev) endif() if (NGRAPH_ONNX_IMPORT_ENABLE) diff --git a/ngraph/core/CMakeLists.txt b/ngraph/core/CMakeLists.txt index ff86d0db0a5..fa3a91c34f8 100644 --- a/ngraph/core/CMakeLists.txt +++ b/ngraph/core/CMakeLists.txt @@ -101,14 +101,14 @@ install(TARGETS ngraph EXPORT ngraphTargets LIBRARY DESTINATION ${NGRAPH_INSTALL_LIB} COMPONENT ngraph) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION ${NGRAPH_INSTALL_INCLUDE} - COMPONENT ngraph + COMPONENT ngraph_dev FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h" ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/ngraph/version.hpp DESTINATION ${NGRAPH_INSTALL_INCLUDE}/ngraph - COMPONENT ngraph) + COMPONENT ngraph_dev) set(CPACK_GENERATOR "DEB") set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)