Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[infra] Update protobuf to 3.20 #14535

Merged
merged 6 commits into from
Jan 22, 2025
Merged

[infra] Update protobuf to 3.20 #14535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9cfb0c8
[onert/doc] Add onert on-device compiler document (#14425)
hseok-oh Dec 9, 2024
ba3131b
Merge remote-tracking branch 'origin/master'
tomdol Dec 18, 2024
fb69526
Merge remote-tracking branch 'origin/master' into protobuf_update
tomdol Jan 9, 2025
329c5e2
[infra] Update protobuf to 3.20.1
tomdol Jan 9, 2025
297ae26
Merge remote-tracking branch 'one/master' into protobuf_update
tomdol Jan 21, 2025
02ee378
Use PB 3.20.2
tomdol Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions infra/cmake/packages/ProtobufConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ endfunction(_Protobuf_module_import)
function(_Protobuf_import)
# Let's use find_package here not to export unnecessary definitions
# NOTE Here we use "exact" match to avoid possible infinite loop
find_package(protobuf EXACT 3.5.2 QUIET)
find_package(protobuf EXACT 3.20.2.0 QUIET)

if(NOT protobuf_FOUND)
set(Protobuf_FOUND FALSE PARENT_SCOPE)
Expand Down Expand Up @@ -65,7 +65,7 @@ function(_Protobuf_build)
INSTALL_DIR ${EXT_OVERLAY_DIR}
BUILD_FLAGS -fPIC
EXTRA_OPTS -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_WITH_ZLIB=OFF
IDENTIFIER "3.5.2-fix2"
IDENTIFIER "3.20.2.0"
PKG_NAME "PROTOBUF")

endfunction(_Protobuf_build)
Expand Down
18 changes: 0 additions & 18 deletions infra/cmake/packages/ProtobufSource.patch
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions infra/cmake/packages/ProtobufSourceConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ function(_ProtobufSource_import)
nnas_include(OptionTools)

envoption(EXTERNAL_DOWNLOAD_SERVER "https://github.com")
envoption(PROTOBUF_URL ${EXTERNAL_DOWNLOAD_SERVER}/protocolbuffers/protobuf/archive/v3.5.2.tar.gz)
envoption(PROTOBUF_URL ${EXTERNAL_DOWNLOAD_SERVER}/protocolbuffers/protobuf/archive/v3.20.2.tar.gz)

ExternalSource_Download(PROTOBUF ${PROTOBUF_URL}
PATCH ${CMAKE_CURRENT_LIST_DIR}/ProtobufSource.patch)
ExternalSource_Download(PROTOBUF ${PROTOBUF_URL})

set(ProtobufSource_DIR ${PROTOBUF_SOURCE_DIR} PARENT_SCOPE)
set(ProtobufSource_FOUND TRUE PARENT_SCOPE)
Expand Down