Merged ngraph & core components (#9101)

CMakeLists.txt

@@ -49,6 +49,7 @@ foreach(component IN LISTS openvino_export_components)
     file(REMOVE "${CMAKE_BINARY_DIR}/${component}_dev_targets.cmake")
     unset(${component} CACHE)
 endforeach()
+unset(openvino_export_components CACHE)
 
 #
 # Build

cmake/developer_package/frontends/frontends.cmake

@@ -187,13 +187,13 @@ macro(ov_add_frontend)
     if(proto_files)
         if(OV_FRONTEND_PROTOBUF_LITE)
             if(NOT protobuf_lite_installed)
-                ov_install_static_lib(${Protobuf_LITE_LIBRARIES} ngraph)
+                ov_install_static_lib(${Protobuf_LITE_LIBRARIES} core)
                 set(protobuf_lite_installed ON CACHE INTERNAL "" FORCE)
             endif()
             link_system_libraries(${TARGET_NAME} PRIVATE ${Protobuf_LITE_LIBRARIES})
         else()
             if(NOT protobuf_installed)
-                ov_install_static_lib(${Protobuf_LIBRARIES} ngraph)
+                ov_install_static_lib(${Protobuf_LIBRARIES} core)
                 set(protobuf_installed ON CACHE INTERNAL "" FORCE)
             endif()
             link_system_libraries(${TARGET_NAME} PRIVATE ${Protobuf_LIBRARIES})
@@ -216,18 +216,18 @@ macro(ov_add_frontend)
                 set(export_set EXPORT OpenVINOTargets)
             endif()
             install(TARGETS ${TARGET_NAME} ${export_set}
-                    RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ngraph
-                    ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT ngraph
-                    LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ngraph)
+                    RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
+                    ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
+                    LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
         else()
-            ov_install_static_lib(${TARGET_NAME} ngraph)
+            ov_install_static_lib(${TARGET_NAME} core)
         endif()
 
         if(OV_FRONTEND_LINKABLE_FRONTEND)
             # install -dev part
             install(DIRECTORY ${${TARGET_NAME}_INCLUDE_DIR}/${OV_FRONTEND_NAME}_frontend
                     DESTINATION ${FRONTEND_INSTALL_INCLUDE}
-                    COMPONENT ngraph_dev
+                    COMPONENT core_dev
                     FILES_MATCHING PATTERN "*.hpp")
 
             set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME frontend::${OV_FRONTEND_NAME})
@@ -236,6 +236,6 @@ macro(ov_add_frontend)
         endif()
     else()
         # skipped frontend has to be installed in static libraries case
-        ov_install_static_lib(${TARGET_NAME} ngraph)
+        ov_install_static_lib(${TARGET_NAME} core)
     endif()
 endmacro()

cmake/extra_modules.cmake

@@ -32,8 +32,8 @@ endfunction()
 
 function(register_extra_modules)
     # post export
-    openvino_developer_export_targets(COMPONENT inference_engine TARGETS inference_engine)
-    openvino_developer_export_targets(COMPONENT ngraph TARGETS ngraph)
+    openvino_developer_export_targets(COMPONENT core TARGETS inference_engine)
+    openvino_developer_export_targets(COMPONENT core TARGETS ngraph)
 
     set(InferenceEngineDeveloperPackage_DIR "${CMAKE_CURRENT_BINARY_DIR}/runtime")
 
@@ -94,7 +94,7 @@ endfunction()
 #
 
 # for Template plugin
-openvino_developer_export_targets(COMPONENT ngraph TARGETS ngraph_backend interpreter_backend)
+openvino_developer_export_targets(COMPONENT core TARGETS ngraph_backend interpreter_backend)
 
 # this InferenceEngineDeveloperPackageConfig.cmake is not used
 # during extra modules build since it's generated after modules

docs/template_plugin/src/CMakeLists.txt

@@ -40,5 +40,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
 #                     POSSIBLE_PLUGINS ${TARGET_NAME})
 # [cmake:plugin]
 
-ov_install_static_lib(ngraph_backend ngraph)
-ov_install_static_lib(interpreter_backend ngraph)
+ov_install_static_lib(ngraph_backend tests)
+ov_install_static_lib(interpreter_backend tests)

inference-engine/src/offline_transformations/CMakeLists.txt

@@ -29,4 +29,4 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
 
 # developer package
 
-openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})

inference-engine/src/vpu/common/CMakeLists.txt

@@ -50,7 +50,7 @@ function(add_common_target TARGET_NAME STATIC_IE)
 
     set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_RELEASE ${ENABLE_LTO})
 
-    openvino_developer_export_targets(COMPONENT inference_engine_vpu TARGETS ${TARGET_NAME})
+    openvino_developer_export_targets(COMPONENT vpu TARGETS ${TARGET_NAME})
 
     target_link_libraries(${TARGET_NAME} PUBLIC ngraph inference_engine_transformations
                                          PRIVATE openvino::itt)

inference-engine/src/vpu/graph_transformer/CMakeLists.txt

@@ -66,7 +66,7 @@ function(add_graph_transformer_target TARGET_NAME STATIC_IE)
 
     if(NOT STATIC_IE)
         add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME} CUSTOM_FILTERS "+runtime/explicit")
-        openvino_developer_export_targets(COMPONENT inference_engine_vpu TARGETS ${TARGET_NAME})
+        openvino_developer_export_targets(COMPONENT vpu TARGETS ${TARGET_NAME})
         ov_install_static_lib(${TARGET_NAME} myriad)
     endif()
 

inference-engine/tests/functional/plugin/shared/CMakeLists.txt

@@ -36,7 +36,7 @@ addIeTarget(
             ${CMAKE_CURRENT_SOURCE_DIR}/src
         ADD_CPPLINT
         DEVELOPER_PACKAGE
-            inference_engine_tests
+            tests
         EXCLUDED_SOURCE_PATHS ${EXCLUDED_SOURCE_PATHS}
         DEFINES ${DEFINES}
         INCLUDES

inference-engine/tests/functional/shared_test_classes/CMakeLists.txt

@@ -10,10 +10,10 @@ addIeTarget(
         ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include"
         ADD_CPPLINT
         DEVELOPER_PACKAGE
-            inference_engine_tests
+            tests
         INCLUDES
-        PUBLIC
-            "${CMAKE_CURRENT_SOURCE_DIR}/include"
+            PUBLIC
+                "${CMAKE_CURRENT_SOURCE_DIR}/include"
         ADDITIONAL_SOURCE_DIRS
             ${CMAKE_CURRENT_SOURCE_DIR}/src
         LINK_LIBRARIES

inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt

@@ -12,7 +12,7 @@ function(add_common_utils ADD_TARGET_NAME)
                 ${CMAKE_CURRENT_SOURCE_DIR}/gtest
             ADD_CPPLINT
             DEVELOPER_PACKAGE
-                inference_engine_tests
+                tests
             LINK_LIBRARIES
                 PUBLIC
                     ngraph

inference-engine/tests/ie_test_utils/functional_test_utils/CMakeLists.txt

@@ -10,7 +10,7 @@ addIeTarget(
     ROOT "${CMAKE_CURRENT_SOURCE_DIR}/include"
     ADD_CPPLINT
     DEVELOPER_PACKAGE
-        inference_engine_tests
+        tests
     INCLUDES
         PUBLIC
         "${CMAKE_CURRENT_SOURCE_DIR}/include"

inference-engine/tests/ie_test_utils/unit_test_utils/CMakeLists.txt

@@ -16,7 +16,7 @@ addIeTarget(
         ROOT ${CMAKE_CURRENT_SOURCE_DIR}
         ADD_CPPLINT
         DEVELOPER_PACKAGE
-            inference_engine_tests
+            tests
         LINK_LIBRARIES
             PUBLIC
                 commonTestUtils_s

inference-engine/tests/ngraph_helpers/lpt_ngraph_functions/CMakeLists.txt

@@ -24,7 +24,7 @@ addIeTarget(
         DEPENDENCIES
             ngraphFunctions
         DEVELOPER_PACKAGE
-            inference_engine_tests
+            tests
 )
 
 ie_faster_build(${TARGET_NAME}

inference-engine/tests/ngraph_helpers/ngraph_functions/CMakeLists.txt

@@ -21,7 +21,7 @@ addIeTarget(
                 interpreter_backend
         ADD_CPPLINT
         DEVELOPER_PACKAGE
-            inference_engine_tests
+            tests
 )
 
 ie_faster_build(${TARGET_NAME}

inference-engine/tests_deprecated/behavior/shared_tests/CMakeLists.txt

@@ -29,4 +29,4 @@ target_include_directories(${TARGET_NAME} PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}/plugin_tests)
 
 # developer package
-openvino_developer_export_targets(COMPONENT inference_engine_tests TARGETS ${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT tests TARGETS ${TARGET_NAME})

inference-engine/tests_deprecated/functional/shared_tests/CMakeLists.txt

@@ -62,4 +62,4 @@ endif()
 
 # developer package
 
-openvino_developer_export_targets(COMPONENT inference_engine_tests TARGETS ${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT tests TARGETS ${TARGET_NAME})

inference-engine/tests_deprecated/functional/vpu/CMakeLists.txt

@@ -14,20 +14,22 @@ endif()
 
 addIeTarget(
         NAME myriadTestData
-        DEVELOPER_PACKAGE inference_engine_tests
+        DEVELOPER_PACKAGE
+            tests
         TYPE STATIC
         ROOT ${CMAKE_CURRENT_SOURCE_DIR}/test_data
         LINK_LIBRARIES
-        ieTestHelpers
+            ieTestHelpers
         DEFINES
-        PUBLIC
-        DATA_PATH=\"${DATA_PATH}\"
-        MODELS_PATH=\"${MODELS_PATH}\"
+            PUBLIC
+            DATA_PATH=\"${DATA_PATH}\"
+            MODELS_PATH=\"${MODELS_PATH}\"
 )
 
 addIeTarget(
     NAME VPUCommonTests
-    DEVELOPER_PACKAGE inference_engine_tests
+    DEVELOPER_PACKAGE
+        tests
     TYPE STATIC
     ROOT ${CMAKE_CURRENT_SOURCE_DIR}/common
     ADDITIONAL_SOURCE_DIRS
@@ -52,7 +54,7 @@ target_include_directories(VPUCommonTests INTERFACE
     $<TARGET_PROPERTY:vpu_graph_transformer,INTERFACE_INCLUDE_DIRECTORIES>
     )
 
-openvino_developer_export_targets(COMPONENT inference_engine_vpu TARGETS vpu_custom_kernels)
+openvino_developer_export_targets(COMPONENT vpu TARGETS vpu_custom_kernels)
 
 addIeTargetTest(
     NAME MyriadFunctionalTests

inference-engine/tests_deprecated/helpers/CMakeLists.txt

@@ -47,5 +47,5 @@ endif()
 
 # developer package
 
-openvino_developer_export_targets(COMPONENT inference_engine_tests
+openvino_developer_export_targets(COMPONENT tests
                                   TARGETS ieTestHelpers ieTestHelpers_s)

inference-engine/thirdparty/movidius/XLink/CMakeLists.txt

@@ -40,5 +40,5 @@ endif()
 
 set_property(TARGET ${TARGET_NAME} PROPERTY C_STANDARD 99)
 
-openvino_developer_export_targets(COMPONENT inference_engine_vpu TARGETS ${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT vpu TARGETS ${TARGET_NAME})
 ov_install_static_lib(${TARGET_NAME} myriad)

inference-engine/thirdparty/movidius/mvnc/CMakeLists.txt

@@ -72,7 +72,7 @@ if(NOT WIN32)
             ${LIBUSB_LIBRARY})
 endif()
 
-openvino_developer_export_targets(COMPONENT inference_engine_vpu TARGETS ${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT vpu TARGETS ${TARGET_NAME})
 ov_install_static_lib(${TARGET_NAME} myriad)
 
 if(ENABLE_TESTS AND ENABLE_MYRIAD_MVNC_TESTS)

src/bindings/c/src/CMakeLists.txt

@@ -34,7 +34,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME runtime::c)
 export(TARGETS ${TARGET_NAME} NAMESPACE openvino::
        APPEND FILE "${CMAKE_BINARY_DIR}/OpenVINOTargets.cmake")
 
-openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
 
 # install
 

src/common/conditional_compilation/CMakeLists.txt

@@ -46,8 +46,8 @@ elseif(SELECTIVE_BUILD STREQUAL "ON")
     ov_force_include(${TARGET_NAME} INTERFACE ${GENERATED_HEADER})
 endif()
 
-ov_install_static_lib(${TARGET_NAME} ngraph)
+ov_install_static_lib(${TARGET_NAME} core)
 
 file(GLOB_RECURSE hdrs ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp)
 add_cpplint_target(${TARGET_NAME}_cpplint FOR_SOURCES ${hdrs})
-openvino_developer_export_targets(COMPONENT openvino_common TARGETS openvino::conditional_compilation)
+openvino_developer_export_targets(COMPONENT core TARGETS openvino::conditional_compilation)

src/common/itt/CMakeLists.txt

@@ -36,4 +36,4 @@ target_include_directories(${TARGET_NAME} PUBLIC
 ov_install_static_lib(${TARGET_NAME} openvino_common)
 
 add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
-openvino_developer_export_targets(COMPONENT openvino_common TARGETS openvino::itt)
+openvino_developer_export_targets(COMPONENT core TARGETS openvino::itt)

src/common/legacy/CMakeLists.txt

@@ -76,7 +76,7 @@ set_target_properties(${TARGET_NAME} ${TARGET_NAME}_obj
 
 # developer package
 
-openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
 
 # install
 

src/common/low_precision_transformations/CMakeLists.txt

@@ -42,7 +42,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
 
 # developer package
 
-openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
 
 # install
 

src/common/preprocessing/CMakeLists.txt

@@ -197,7 +197,7 @@ endif()
 
 # developer package
 
-openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
 
 # install
 

src/common/transformations/CMakeLists.txt

@@ -45,7 +45,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
 
 # developer package
 
-openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
 
 # install
 

src/common/util/CMakeLists.txt

@@ -36,10 +36,10 @@ target_link_libraries(${TARGET_NAME} PRIVATE ${CMAKE_DL_LIBS})
 target_include_directories(${TARGET_NAME} PUBLIC
     $<BUILD_INTERFACE:${UTIL_INCLUDE_DIR}>)
 
-ov_install_static_lib(${TARGET_NAME} ngraph)
+ov_install_static_lib(${TARGET_NAME} core)
 
 add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
 ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME}
                     INCLUDE_DIRECTORY ${UTIL_INCLUDE_DIR})
 
-openvino_developer_export_targets(COMPONENT openvino_common TARGETS ${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})

src/core/CMakeLists.txt

@@ -123,18 +123,15 @@ export(TARGETS ngraph NAMESPACE openvino::
 # Installation logic...
 #-----------------------------------------------------------------------------------------------
 
-ie_cpack_add_component(ngraph REQUIRED)
-ie_cpack_add_component(ngraph_dev REQUIRED DEPENDS ngraph)
-
 install(TARGETS ngraph EXPORT OpenVINOTargets
-        RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ngraph
-        ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT ngraph
-        LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ngraph
+        RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
+        ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
+        LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core
         INCLUDES DESTINATION runtime/include)
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
         DESTINATION "runtime/include"
-        COMPONENT ngraph_dev
+        COMPONENT core_dev
         FILES_MATCHING
             PATTERN "*.hpp"
             PATTERN "*.h")
@@ -150,4 +147,4 @@ write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfig.cmake
               ${CMAKE_CURRENT_BINARY_DIR}/ngraphConfigVersion.cmake
         DESTINATION "runtime/cmake"
-        COMPONENT ngraph_dev)
+        COMPONENT core_dev)

src/core/builder/CMakeLists.txt

@@ -35,8 +35,8 @@ add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
 # Add an alias so that library can be used inside the build tree, e.g. when testing
 add_library(ngraph::builder ALIAS ${TARGET_NAME})
 
-ov_install_static_lib(ngraph_builders ngraph)
+ov_install_static_lib(ngraph_builders core)
 
 # developer package
 
-openvino_developer_export_targets(COMPONENT ngraph TARGETS ngraph::builder)
+openvino_developer_export_targets(COMPONENT core TARGETS ngraph::builder)

src/core/reference/CMakeLists.txt

@@ -43,7 +43,7 @@ add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
 # Add an alias so that library can be used inside the build tree, e.g. when testing
 add_library(ngraph::reference ALIAS ${TARGET_NAME})
 
-ov_install_static_lib(${TARGET_NAME} ngraph)
+ov_install_static_lib(${TARGET_NAME} core)
 
 # developer package
-openvino_developer_export_targets(COMPONENT ngraph TARGETS ngraph::reference)
+openvino_developer_export_targets(COMPONENT core TARGETS ngraph::reference)

src/core/shape_inference/CMakeLists.txt

@@ -26,7 +26,7 @@ if(NOT BUILD_SHARED_LIBS)
     target_compile_definitions(${TARGET_NAME} PUBLIC OPENVINO_STATIC_LIBRARY)
 endif()
 
-ov_install_static_lib(${TARGET_NAME} ngraph)
+ov_install_static_lib(${TARGET_NAME} core)
 
 # developer package
-openvino_developer_export_targets(COMPONENT ngraph TARGETS ${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})

src/core/tests/util/CMakeLists.txt

@@ -15,4 +15,4 @@ file(GLOB_RECURSE all_util_src "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" "${CMAKE_CURR
 add_clang_format_target(ngraph_test_util_clang FOR_SOURCES ${all_util_src})
 
 # developer package
-openvino_developer_export_targets(COMPONENT ngraph TARGETS ngraph_test_util)
+openvino_developer_export_targets(COMPONENT core TARGETS ngraph_test_util)

src/frontends/common/CMakeLists.txt

@@ -66,30 +66,30 @@ if(BUILD_SHARED_LIBS)
         $<BUILD_INTERFACE:${FRONTEND_INCLUDE_DIR}>)
     target_include_directories(${TARGET_NAME}_static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
     target_compile_definitions(${TARGET_NAME}_static PUBLIC USE_STATIC_FRONTEND_COMMON)
-    ov_install_static_lib(${TARGET_NAME}_static ngraph)
+    ov_install_static_lib(${TARGET_NAME}_static core)
 else()
     add_library(${TARGET_NAME}::static ALIAS ${TARGET_NAME})
 endif()
 
-openvino_developer_export_targets(COMPONENT ngraph TARGETS ${TARGET_NAME})
+openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME})
 
 # Installation rules for shared version only
 
 set_target_properties(${TARGET_NAME} PROPERTIES EXPORT_NAME frontend::common)
 
 install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
-        RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT ngraph
-        ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT ngraph
-        LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT ngraph)
+        RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
+        ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
+        LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core)
 
 install(DIRECTORY ${FRONTEND_INCLUDE_DIR}/common
         DESTINATION ${FRONTEND_INSTALL_INCLUDE}
-        COMPONENT ngraph_dev
+        COMPONENT core_dev
         FILES_MATCHING PATTERN "*.hpp")
 
 install(DIRECTORY ${FRONTEND_INCLUDE_DIR}/
         DESTINATION ${FRONTEND_INSTALL_INCLUDE}
-        COMPONENT ngraph_dev
+        COMPONENT core_dev
         FILES_MATCHING PATTERN "manager.hpp")
 
 export(TARGETS ${TARGET_NAME} NAMESPACE openvino::

src/frontends/onnx/frontend/CMakeLists.txt

@@ -21,5 +21,5 @@ ov_ncc_naming_style(FOR_TARGET ${TARGET_NAME}
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/onnx_import
         DESTINATION ${FRONTEND_INSTALL_INCLUDE}
-        COMPONENT ngraph_dev
+        COMPONENT core_dev
         FILES_MATCHING PATTERN "*.hpp")

src/frontends/onnx/onnx_common/CMakeLists.txt

@@ -36,4 +36,4 @@ endif()
 target_include_directories(${TARGET_NAME} PRIVATE ${ONNX_COMMON_SRC_DIR})
 add_clang_format_target(${TARGET_NAME}_clang FOR_TARGETS ${TARGET_NAME})
 
-ov_install_static_lib(${TARGET_NAME} ngraph)
+ov_install_static_lib(${TARGET_NAME} core)

src/inference/CMakeLists.txt

@@ -246,7 +246,7 @@ export(TARGETS ${TARGET_NAME} NAMESPACE openvino::
 
 # Export for developer package
 
-openvino_developer_export_targets(COMPONENT inference_engine TARGETS ${TARGET_NAME}_plugin_api)
+openvino_developer_export_targets(COMPONENT core TARGETS ${TARGET_NAME}_plugin_api)
 
 # install TBB
 
@@ -310,7 +310,7 @@ endif()
 # Install Inference Engine
 
 ie_cpack_add_component(core REQUIRED DEPENDS ${core_components})
-ie_cpack_add_component(core_dev REQUIRED core ngraph_dev)
+ie_cpack_add_component(core_dev REQUIRED core)
 
 install(DIRECTORY "${PUBLIC_HEADERS_DIR}/" DESTINATION runtime/include
         COMPONENT core_dev)

thirdparty/CMakeLists.txt

@@ -74,7 +74,7 @@ openvino_developer_export_targets(COMPONENT openvino_common TARGETS gflags)
 if(ENABLE_OV_CORE_UNIT_TESTS OR ENABLE_TESTS)
     add_subdirectory(gtest EXCLUDE_FROM_ALL)
 
-    openvino_developer_export_targets(COMPONENT inference_engine_tests
+    openvino_developer_export_targets(COMPONENT tests
                                       TARGETS gmock gmock_main gtest gtest_main)
 endif()
 
@@ -191,9 +191,9 @@ endif()
 #
 # nlohmann json
 #
+
 if(ENABLE_SAMPLES OR ENABLE_OV_PDPD_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND)
     add_subdirectory(nlohmann_json EXCLUDE_FROM_ALL)
-    openvino_developer_export_targets(COMPONENT openvino_common TARGETS nlohmann_json)
 endif()
 
 #

thirdparty/onnx/CMakeLists.txt

@@ -43,16 +43,16 @@ ov_disable_all_warnings(onnx onnx_proto)
 
 # install
 
-ov_install_static_lib(onnx ngraph)
-ov_install_static_lib(onnx_proto ngraph)
+ov_install_static_lib(onnx core)
+ov_install_static_lib(onnx_proto core)
 
 # WA for ONNX: protobuf must be in the same export set of ONNX targets
 if(NOT BUILD_SHARED_LIBS)
     if(ONNX_USE_LITE_PROTO)
         install(TARGETS ${Protobuf_LITE_LIBRARIES} EXPORT ONNXTargets
-                ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT ngraph)
+                ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core)
     else()
         install(TARGETS ${Protobuf_LIBRARIES} EXPORT ONNXTargets
-                ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT ngraph)
+                ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core)
     endif()
 endif()