Tuned locations

cmake/developer_package/packaging/debian.cmake

@@ -17,13 +17,14 @@ macro(ov_debian_cpack_set_dirs)
     set(OV_CPACK_IE_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/inferenceengine${OpenVINO_VERSION})
     set(OV_CPACK_NGRAPH_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/ngraph${OpenVINO_VERSION})
     set(OV_CPACK_OPENVINO_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/openvino${OpenVINO_VERSION})
-    set(OV_CPACK_DOCDIR ${CMAKE_INSTALL_DOCDIR}) # TODO: check versions
+    set(OV_CPACK_DOCDIR ${CMAKE_INSTALL_DATADIR}/doc/openvino${OpenVINO_VERSION})
 
     # non-native stuff
     set(OV_CPACK_PYTHONDIR ${OV_CPACK_PLUGINSDIR})
     set(OV_CPACK_SHAREDIR ${CMAKE_INSTALL_DATADIR}/openvino${OpenVINO_VERSION}) # internal
     set(OV_CPACK_SAMPLESDIR ${OV_CPACK_SHAREDIR}/samples)
-    set(OV_CPACK_TOOLSDIR ${OV_CPACK_SHAREDIR}/tools)
+    set(OV_CPACK_TOOLSDIR bin) # only C++ tools are here
+    set(OV_CPACK_DEVREQDIR ${OV_CPACK_SHAREDIR})
 
     set(OV_CPACK_WHEELSDIR .) # TODO
 

cmake/developer_package/packaging/packaging.cmake

@@ -22,6 +22,7 @@ macro(ov_cpack_set_dirs)
     set(OV_CPACK_PYTHONDIR python)
     set(OV_CPACK_WHEELSDIR tools)
     set(OV_CPACK_TOOLSDIR tools)
+    set(OV_CPACK_DEVREQDIR tools)
 
     if(WIN32)
         set(OV_CPACK_LIBRARYDIR runtime/lib/${ARCH_FOLDER}/$<CONFIG>)
@@ -88,7 +89,9 @@ set(OV_CPACK_COMP_DEPLOYMENT_MANAGER "deployment_manager")
 # Include debian specific configuration file:
 # - overrides directories set by ov_cpack_set_dirs()
 # - merges some components
-include(packaging/debian)
+if(CPACK_GENERATOR STREQUAL "DEB")
+    include(packaging/debian)
+endif()
 
 macro(ie_cpack)
     if(NOT DEFINED CPACK_GENERATOR)

src/plugins/intel_myriad/myriad_plugin/CMakeLists.txt

@@ -56,6 +56,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
 # install, but need to remove this script and write post-installation steps to docs
 if (LINUX AND NOT CPACK_GENERATOR STREQUAL "DEB")
     install(FILES ${mvnc_SOURCE_DIR}/src/97-myriad-usbboot.rules
-        DESTINATION share/openvino${OpenVINO_VERSION}/install_dependencies
-        COMPONENT myriad)
+            DESTINATION install_dependencies
+            COMPONENT myriad)
 endif()

tools/CMakeLists.txt

@@ -45,7 +45,7 @@ foreach(EXTRAS ${EXTRAS_LIST})
     configure_file(${REQUIREMENTS_IN} ${REQUIREMENTS_OUT})
 
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${REQUIREMENTS_OUT}
-            DESTINATION ${OV_CPACK_TOOLSDIR}
+            DESTINATION ${OV_CPACK_DEVREQDIR}
             COMPONENT ${OV_CPACK_COMP_DEV_REQ_FILES}
             EXCLUDE_FROM_ALL)
 endforeach()