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

Upgrade protobuf to 3.18.2 (#10435)

Browse Source 
* Upgrade protobuf to 3.19.4

* Upgdate precompiled protoc version

* Update protobuf to v3.18.2

Updating further peding this fix to be released
https://github.com/protocolbuffers/protobuf/pull/9437

* Disable warnings for protobuf
This commit is contained in:
Andrey Somsikov 2022-02-18 11:43:19 +03:00 committed by GitHub
parent 03862e780f
commit dea35b8e6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/dependencies.cmake
View File

@ -28,12 +28,12 @@ if(COMMAND get_linux_name)
endif() endif()
if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") if(CMAKE_CROSSCOMPILING AND CMAKE_HOST_SYSTEM_NAME MATCHES Linux AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
set(protoc_version "3.9.2") set(protoc_version "3.18.2")
RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT RESOLVE_DEPENDENCY(SYSTEM_PROTOC_ROOT
ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz" ARCHIVE_LIN "protoc-${protoc_version}-linux-x86_64.tar.gz"
TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64" TARGET_PATH "${TEMP}/protoc-${protoc_version}-linux-x86_64"
SHA256 "1d6da1d97d0cbfcd333558afe24533eb3cb48dc1e0ab5e971aa1e50ede8bcf45" SHA256 "42fde2b6044c1f74c7e86d4e03b43aac87128ddf57ac6ed8c4eab7a1e21bbf21"
) )
debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT}) debug_message(STATUS "host protoc-${protoc_version} root path = " ${SYSTEM_PROTOC_ROOT})

2
thirdparty/CMakeLists.txt vendored
View File

@ -88,7 +88,7 @@ if(ENABLE_OV_PADDLE_FRONTEND OR ENABLE_OV_ONNX_FRONTEND OR ENABLE_OV_TF_FRONTEND
if(VERBOSE_BUILD) if(VERBOSE_BUILD)
set(Protobuf_DEBUG ON) set(Protobuf_DEBUG ON)
endif() endif()
find_package(Protobuf 3.9.0 REQUIRED) find_package(Protobuf 3.18.2 REQUIRED)
set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite) set(Protobuf_LITE_LIBRARIES protobuf::libprotobuf-lite)
set(Protobuf_LIBRARIES protobuf::libprotobuf) set(Protobuf_LIBRARIES protobuf::libprotobuf)
set(SYSTEM_PROTOC protobuf::protoc) set(SYSTEM_PROTOC protobuf::protoc)

5
thirdparty/protobuf/CMakeLists.txt vendored
View File

@ -16,6 +16,11 @@ if(OV_COMPILER_IS_CLANG)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override")
endif() endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# protobuf\src\google\protobuf\descriptor.cc(822) : error C4703: potentially uninitialized local pointer variable 'to_use' used
add_definitions("/wd4703")
endif()
set(protobuf_VERBOSE ON) set(protobuf_VERBOSE ON)
set(protobuf_BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE) set(protobuf_BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE)
set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE) set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE)

2
thirdparty/protobuf/protobuf vendored

@ -1 +1 @@
Subproject commit 52b2447247f535663ac1c292e088b4b27d2910ef Subproject commit 6c6b0778b70f35f93c2f0dee30e5d12ad2a83eea