cmake: bump protobuf to v33.1

This commit is contained in:
Corentin Le Molgat
2025-11-14 17:32:16 +01:00
parent b097be0b77
commit 2a36fb057b
10 changed files with 11 additions and 11 deletions

View File

@@ -1,6 +1,6 @@
ZLIB=1.3.1
abseil-cpp=20250814.1
Protobuf=v32.0
Protobuf=v33.1
Eigen=3.4.0
Re2=2025-08-12
CoinUtils=2.11.12

View File

@@ -141,12 +141,12 @@ if(BUILD_Protobuf)
FetchContent_Declare(
Protobuf
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
GIT_TAG "v32.0"
GIT_TAG "v33.1"
GIT_SHALLOW TRUE
GIT_SUBMODULES ""
UPDATE_COMMAND git reset --hard
PATCH_COMMAND git apply --ignore-whitespace
"${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v32.0.patch"
"${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v33.1.patch"
OVERRIDE_FIND_PACKAGE # Make package visible for "protobuf-matchers" below
)
set(protobuf_BUILD_TESTS OFF)

View File

@@ -121,11 +121,11 @@ list(APPEND CMAKE_MESSAGE_INDENT " ")
FetchContent_Declare(
protobuf
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
GIT_TAG "v32.0"
GIT_TAG "v33.1"
GIT_SHALLOW TRUE
GIT_SUBMODULES ""
PATCH_COMMAND git apply --ignore-whitespace
"${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v32.0.patch"
"${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v33.1.patch"
)
set(protobuf_BUILD_TESTS OFF)
set(protobuf_BUILD_SHARED_LIBS ON)

View File

@@ -184,7 +184,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.32.0"/>
<PackageReference Include="Google.Protobuf" Version="3.33.1"/>
</ItemGroup>
<!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->

View File

@@ -172,7 +172,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.32.0"/>
<PackageReference Include="Google.Protobuf" Version="3.33.1"/>
</ItemGroup>
<!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->

View File

@@ -109,7 +109,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>4.32.0</version>
<version>4.33.1</version>
</dependency>
</dependencies>

View File

@@ -81,7 +81,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>4.32.0</version>
<version>4.33.1</version>
</dependency>
</dependencies>

View File

@@ -46,7 +46,7 @@ setup(
'absl-py >= 2.0.0',
'numpy >= 2.0.2',
'pandas >= 2.0.0',
'protobuf >= 6.32.0,<6.33',
'protobuf >= 6.33.1,<6.34',
'typing-extensions >= 4.12',
'immutabledict >= 3.0.0',
],

View File

@@ -35,7 +35,7 @@ index d8565c0..24b7f52 100644
set(proto_URL https://github.com/protocolbuffers/protobuf.git)
-set(proto_TAG v30.2)
+set(proto_TAG v32.0)
+set(proto_TAG v33.1)
set(nlohmann_json_URL https://github.com/nlohmann/json.git)
set(nlohmann_json_TAG v3.11.3)