diff --git a/cmake/developer_package/packaging.cmake b/cmake/developer_package/packaging.cmake index 11c667c023b..8c444e71018 100644 --- a/cmake/developer_package/packaging.cmake +++ b/cmake/developer_package/packaging.cmake @@ -17,10 +17,10 @@ function(ie_cpack_set_library_dir) set(IE_CPACK_ARCHIVE_PATH lib/${ARCH_FOLDER}/$ PARENT_SCOPE) else() if(CPACK_GENERATOR STREQUAL "DEB") - # TODO - set(IE_CPACK_LIBRARY_PATH lib PARENT_SCOPE) - set(IE_CPACK_RUNTIME_PATH lib PARENT_SCOPE) - set(IE_CPACK_ARCHIVE_PATH lib PARENT_SCOPE) + # TODO: support other architectures + set(IE_CPACK_LIBRARY_PATH lib/x86_64-linux-gnu PARENT_SCOPE) + set(IE_CPACK_RUNTIME_PATH lib/x86_64-linux-gnu PARENT_SCOPE) + set(IE_CPACK_ARCHIVE_PATH lib/x86_64-linux-gnu PARENT_SCOPE) else() set(IE_CPACK_LIBRARY_PATH lib/${ARCH_FOLDER} PARENT_SCOPE) set(IE_CPACK_RUNTIME_PATH lib/${ARCH_FOLDER} PARENT_SCOPE) @@ -82,6 +82,10 @@ if(CPACK_GENERATOR STREQUAL "DEB") set(OV_COMP_DEV_REQ_FILES "${OV_COMP_CORE_DEV}") # move core_tools to core-dev set(OV_COMP_CORE_TOOLS "${OV_COMP_CORE_DEV}") + # move licensing to core + set(OV_COMP_LICENSING "${OV_COMP_CORE}") + # move install_dependencies to core as well + set(OV_COMP_INSTALL_DEPENDENCIES "${OV_COMP_CORE}") endif() macro(ie_cpack) @@ -253,10 +257,7 @@ macro(ie_cpack) set(CPACK_COMPONENT_CORE_DEV_DESCRIPTION "OpenVINO C / C++ Runtime development files") set(CPACK_COMPONENT_CORE_DEV_DEPENDS "core") set(CPACK_DEBIAN_CORE_DEV_PACKAGE_NAME "libopenvino-dev") - # Looks like it's arch dependent - # set(CPACK_DEBIAN_CORE_DEV_PACKAGE_ARCHITECTURE "all") - # set(CPACK_DEBIAN_CORE_PACKAGE_DEPENDS "libtbb-dev") - # set(CPACK_DEBIAN_CORE_DEV_PACKAGE_CONFLICTS "!!!") + # set(CPACK_DEBIAN_CORE_DEV_PACKAGE_CONFLICTS "") ov_add_lintian_suppression(core_dev) # @@ -363,11 +364,6 @@ macro(ie_cpack) set(CPACK_DEBIAN_INSTALL_DEPENDENCIES_PACKAGE_DEPENDS "python3, TODO") set(CPACK_DEBIAN_INSTALL_DEPENDENCIES_PACKAGE_ARCHITECTURE "all") - # install dependencies - set(CPACK_COMPONENT_CORE_TOOLS_DESCRIPTION "OpenVINO Tools") - set(CPACK_COMPONENT_CORE_TOOLS_DEPENDS "core") - set(CPACK_DEBIAN_CORE_TOOLS_PACKAGE_NAME "libopenvino-tools") - # licensing set(CPACK_COMPONENT_LICENSING_DESCRIPTION "OpenVINO lincences") set(CPACK_DEBIAN_LICENSING_PACKAGE_NAME "libopenvino-licensing") diff --git a/licensing/CMakeLists.txt b/licensing/CMakeLists.txt index 8184a3634a3..4e7df70615e 100644 --- a/licensing/CMakeLists.txt +++ b/licensing/CMakeLists.txt @@ -6,11 +6,11 @@ # Install licensing # -ie_cpack_add_component(licensing) +ie_cpack_add_component(${OV_COMP_LICENSING}) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION share/doc/openvino/licensing - COMPONENT licensing + COMPONENT ${OV_COMP_LICENSING} PATTERN CMakeLists.txt EXCLUDE PATTERN dev-third-party-programs.txt EXCLUDE PATTERN documentation-third-party-programs.txt EXCLUDE diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 03d24049007..c9829fb0187 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -42,9 +42,9 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_SOURCE_DIR}" # install install_dependencies if(UNIX) - ie_cpack_add_component(install_dependencies REQUIRED) + ie_cpack_add_component(${OV_COMP_INSTALL_DEPENDENCIES} REQUIRED) install(DIRECTORY install_dependencies/ DESTINATION share/openvino/install_dependencies - COMPONENT install_dependencies + COMPONENT ${OV_COMP_INSTALL_DEPENDENCIES} USE_SOURCE_PERMISSIONS) endif()