diff --git a/cmake/developer_package/packaging/debian.cmake b/cmake/developer_package/packaging/debian.cmake index 3cd299ab0fb..692fcfa6b5c 100644 --- a/cmake/developer_package/packaging/debian.cmake +++ b/cmake/developer_package/packaging/debian.cmake @@ -145,6 +145,9 @@ function(ov_add_lintian_suppression comp) COMPONENT ${comp}) endfunction() +# +# Adds component for `comp`, but without a version +# macro(ov_add_latest_component comp) string(TOUPPER "${comp}" ucomp) set(latest "${ucomp}_LATEST") @@ -177,7 +180,8 @@ macro(ov_debian_components) foreach(item ${cpack_components_all}) # don't provide python components and deployment_manager to end users if(# NOT ${item} MATCHES ".*(python).*" AND - NOT ${item} MATCHES "^${OV_CPACK_COMP_DEPLOYMENT_MANAGER}$") + NOT ${item} MATCHES "^tbb(_dev)?$" AND + NOT ${item} STREQUAL "{OV_CPACK_COMP_DEPLOYMENT_MANAGER}") list(APPEND CPACK_COMPONENTS_ALL ${item}) endif() endforeach() diff --git a/cmake/developer_package/packaging/packaging.cmake b/cmake/developer_package/packaging/packaging.cmake index 8cf3e4ce560..e5db1718efc 100644 --- a/cmake/developer_package/packaging/packaging.cmake +++ b/cmake/developer_package/packaging/packaging.cmake @@ -13,6 +13,7 @@ include(GNUInstallDirs) # macro(ov_cpack_set_dirs) # common IRC package locations + # TODO: move current variables to OpenVINO specific locations set(OV_CPACK_INCLUDEDIR runtime/include) set(OV_CPACK_IE_CMAKEDIR runtime/cmake) set(OV_CPACK_NGRAPH_CMAKEDIR runtime/cmake) @@ -145,7 +146,11 @@ macro(ie_cpack) set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) elseif(CPACK_GENERATOR STREQUAL "DEB") # include Debian dedicated per-component configuration file - ov_debian_components() + # NOTE: private modules need to define ov_debian_components macro + # for custom debian packages configuration + if(COMMAND ov_debian_components) + ov_debian_components() + endif() endif() include(CPack)