Library versions & made tests relocatable (#12416)
* Fixes for cases when TBB_DIR env var is set * Don't use make in build_samples.sh script * First version of Windows installer * WIndows NSIS installer * Improved version of debian packages * Improvements * Improvements * Debian packages now look good * Library versioning * Fixed tests to run against debian packages * Fixed frontend tests * Fixed code style * FIxed Windows * Fixed python tests * Fixed paths in tests * fdvfdv * Fixes * USe versioning only for debian packages * Relocatable tests * Fixed * Fixed all tests * Fixed clang-format * Fixed more tests * Fixed some tests * Absolute paths in .ci * Fixes * Added support of OpenCV 3.4 * Trying to fix gnaUnitTests
This commit is contained in:
1 parent
b9126fe6ea
commit
6ca47b074d
87 files changed
+803
-712
No files matched your search
@@ -93,7 +93,14 @@ macro(ov_parse_ci_build_number)
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
set(OpenVINO_SOVERSION "${OpenVINO_VERSION_MAJOR}${OpenVINO_VERSION_MINOR}${OpenVINO_VERSION_PATCH}")
|
||||
set(OpenVINO_VERSION "${OpenVINO_VERSION_MAJOR}.${OpenVINO_VERSION_MINOR}.${OpenVINO_VERSION_PATCH}")
|
||||
# TODO: remove DEB later
|
||||
if(WIN32 OR NOT CPACK_GENERATOR STREQUAL "DEB")
|
||||
set(OpenVINO_VERSION_SUFFIX "")
|
||||
else()
|
||||
set(OpenVINO_VERSION_SUFFIX ".${OpenVINO_VERSION}")
|
||||
endif()
|
||||
message(STATUS "OpenVINO version is ${OpenVINO_VERSION} (Build ${OpenVINO_VERSION_BUILD})")
|
||||
endmacro()
|
||||
|
||||
@@ -131,3 +138,15 @@ macro (addVersionDefines FILE)
|
||||
endforeach()
|
||||
unset(__version_file)
|
||||
endmacro()
|
||||
|
||||
function(ov_add_library_version library)
|
||||
if(CPACK_GENERATOR STREQUAL "DEB")
|
||||
if(NOT DEFINED OpenVINO_SOVERSION)
|
||||
message(FATAL_ERROR "Internal error: OpenVINO_SOVERSION is not defined")
|
||||
endif()
|
||||
|
||||
set_target_properties(${library} PROPERTIES
|
||||
SOVERSION ${OpenVINO_SOVERSION}
|
||||
VERSION ${OpenVINO_VERSION})
|
||||
endif()
|
||||
endfunction()
|
||||
Reference in new issue
Block a user