IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automatic triplet generation; added SOVERSION

Browse Source
This commit is contained in:
Ilya Lavrenov
2022-01-13 16:37:54 +03:00
parent 2267703a55
commit 78073f53ca
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/developer_package/frontends/frontends.cmake
+4 -1
View File
@@ -225,12 +225,15 @@ macro(ov_add_frontend)
if(OV_FRONTEND_LINKABLE_FRONTEND)
set(export_set EXPORT OpenVINOTargets)
set(archive_dest ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core)
set(namelink NAMELINK_COMPONENT core_dev)
else()
set(namelink NAMELINK_SKIP)
endif()
install(TARGETS ${TARGET_NAME} ${export_set}
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
${archive_dest}
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core
NAMELINK_COMPONENT core_dev)
${namelink})
else()
ov_install_static_lib(${TARGET_NAME} core)
endif()
cmake/developer_package/packaging.cmake
+22 -15
View File
@@ -18,19 +18,17 @@ function(ie_cpack_set_library_dir)
set(IE_CPACK_ARCHIVE_PATH lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
set(IE_CPACK_PLUGIN_PATH lib/${ARCH_FOLDER}/$<CONFIG> PARENT_SCOPE)
else()
# if(CPACK_GENERATOR STREQUAL "DEB")
set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE} PARENT_SCOPE)
set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE} PARENT_SCOPE)
set(IE_CPACK_ARCHIVE_PATH ${CMAKE_INSTALL_LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE} PARENT_SCOPE)
set(IE_CPACK_PLUGIN_PATH
${CMAKE_INSTALL_LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE}/openvino${OpenVINO_VERSION}
PARENT_SCOPE)
# else()
# set(IE_CPACK_LIBRARY_PATH lib/${ARCH_FOLDER} PARENT_SCOPE)
# set(IE_CPACK_RUNTIME_PATH lib/${ARCH_FOLDER} PARENT_SCOPE)
# set(IE_CPACK_ARCHIVE_PATH lib/${ARCH_FOLDER} PARENT_SCOPE)
# set(IE_CPACK_PLUGIN_PATH lib/${ARCH_FOLDER} PARENT_SCOPE)
# endif()
if(CPACK_GENERATOR STREQUAL "DEB")
set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
set(IE_CPACK_ARCHIVE_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
set(IE_CPACK_PLUGIN_PATH ${CMAKE_INSTALL_LIBDIR}/openvino${OpenVINO_VERSION} PARENT_SCOPE)
else()
set(IE_CPACK_LIBRARY_PATH lib/${ARCH_FOLDER} PARENT_SCOPE)
set(IE_CPACK_RUNTIME_PATH lib/${ARCH_FOLDER} PARENT_SCOPE)
set(IE_CPACK_ARCHIVE_PATH lib/${ARCH_FOLDER} PARENT_SCOPE)
set(IE_CPACK_PLUGIN_PATH lib/${ARCH_FOLDER} PARENT_SCOPE)
endif()
endif()
endfunction()
@@ -191,7 +189,7 @@ macro(ie_cpack)
# proper way is to use -l (path to libs) and -L (path to shlibs) for other already installed components
# but it require CMake source code changes
# with current WA automatic deps detection via dpkg-shlibdeps for "our libraries"
# is ignored; but dependnencies between our components are here because of
# is ignored; but dependencies between our components are here because of
# CPACK_COMPONENT_<UCOMP>_DEPENDS variables
# More proper WA is try to enable INSTALL_RPATH
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
@@ -266,7 +264,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${cpack_ver_mm}-dev")
# set(CPACK_DEBIAN_CORE_DEV_PACKAGE_CONFLICTS "")
set(CPACK_DEBIAN_CORE_DEV_PACKAGE_CONFLICTS "libopenvino2021.3-dev, libopenvino2021.4-dev")
ov_add_lintian_suppression(core_dev)
#
@@ -282,6 +280,15 @@ macro(ie_cpack)
list(APPEND installed_plugins "hetero")
endif()
# auto batch
if(ENABLE_AUTO_BATCH)
set(CPACK_COMPONENT_BATCH_DESCRIPTION "OpenVINO Auto Batch plugin")
set(CPACK_COMPONENT_BATCH_DEPENDS "core")
set(CPACK_DEBIAN_BATCH_PACKAGE_NAME "libopenvino-auto-batch${cpack_ver_mm}")
set(CPACK_DEBIAN_BATCH_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}")
list(APPEND installed_plugins "batch")
endif()
# multi / auto plugins
if(ENABLE_MULTI)
if(ENABLE_AUTO)
src/cmake/ov_runtime.cmake
+1
View File
@@ -59,6 +59,7 @@ install(TARGETS ${TARGET_NAME} EXPORT OpenVINOTargets
RUNTIME DESTINATION ${IE_CPACK_RUNTIME_PATH} COMPONENT core
ARCHIVE DESTINATION ${IE_CPACK_ARCHIVE_PATH} COMPONENT core
LIBRARY DESTINATION ${IE_CPACK_LIBRARY_PATH} COMPONENT core
NAMELINK_COMPONENT ${OV_COMP_CORE_DEV}
INCLUDES DESTINATION include
include/ie)