dependencies: bump protobuf to v33.1

Author: Mizux

cmake/check_deps.cmake

@@ -41,15 +41,16 @@ set(ABSL_DEPS
   absl::any
   )
 
+if(NOT TARGET protobuf::libprotobuf)
+  message(FATAL_ERROR "Target protobuf::libprotobuf not available.")
+endif()
+
+
 if(NOT TARGET re2::re2)
   message(FATAL_ERROR "Target re2::re2 not available.")
 endif()
 set(RE2_DEPS re2::re2)
 
-if(NOT TARGET protobuf::libprotobuf)
-  message(FATAL_ERROR "Target protobuf::libprotobuf not available.")
-endif()
-
 # CXX Test
 if(BUILD_TESTING)
   if(NOT TARGET GTest::gtest)

cmake/dependencies/CMakeLists.txt

@@ -46,39 +46,18 @@ if(BUILD_absl)
   set(ABSL_USE_SYSTEM_INCLUDES ON)
   # We want Abseil to declare what C++ standard it was compiled with.
   set(ABSL_PROPAGATE_CXX_STD ON)
+  set(ABSL_BUILD_TEST_HELPERS ON)
+  set(ABSL_USE_EXTERNAL_GOOGLETEST ON)
+  set(ABSL_FIND_GOOGLETEST OFF)
   # We want Abseil to keep the INSTALL rules enabled, even though it is a
   # subproject. Otherwise the install rules in this project break.
   set(ABSL_ENABLE_INSTALL ON)
   set(ABSL_BUILD_TESTING OFF)
-  set(ABSL_BUILD_TEST_HELPERS OFF)
-  set(ABSL_USE_EXTERNAL_GOOGLETEST ON)
-  set(ABSL_FIND_GOOGLETEST OFF)
   FetchContent_MakeAvailable(absl)
   list(POP_BACK CMAKE_MESSAGE_INDENT)
   message(CHECK_PASS "fetched")
 endif()
 
-# ##############################################################################
-# RE2
-# ##############################################################################
-if(BUILD_re2)
-  message(CHECK_START "Fetching re2")
-  list(APPEND CMAKE_MESSAGE_INDENT "  ")
-  FetchContent_Declare(
-    re2
-    GIT_REPOSITORY "https://github.com/google/re2.git"
-    GIT_TAG "2025-08-12"
-    GIT_SHALLOW TRUE
-    UPDATE_COMMAND git reset --hard
-    PATCH_COMMAND git apply --ignore-whitespace
-    "${CMAKE_CURRENT_LIST_DIR}/../../patches/re2-2025-08-12.patch"
-  )
-  set(RE2_BUILD_TESTING OFF)
-  FetchContent_MakeAvailable(re2)
-  list(POP_BACK CMAKE_MESSAGE_INDENT)
-  message(CHECK_PASS "fetched")
-endif()
-
 # ##############################################################################
 # Protobuf
 # ##############################################################################
@@ -88,12 +67,13 @@ if(BUILD_Protobuf)
   FetchContent_Declare(
     Protobuf
     GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-    GIT_TAG "v33.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-v33.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)
   set(protobuf_BUILD_SHARED_LIBS ON)
@@ -105,6 +85,28 @@ if(BUILD_Protobuf)
   message(CHECK_PASS "fetched")
 endif()
 
+# ##############################################################################
+# RE2
+# ##############################################################################
+if(BUILD_re2)
+  message(CHECK_START "Fetching re2")
+  list(APPEND CMAKE_MESSAGE_INDENT "  ")
+  FetchContent_Declare(
+    re2
+    GIT_REPOSITORY "https://github.com/google/re2.git"
+    GIT_TAG "2025-08-12"
+    GIT_SHALLOW TRUE
+    UPDATE_COMMAND git reset --hard
+    PATCH_COMMAND git apply --ignore-whitespace
+    "${CMAKE_CURRENT_LIST_DIR}/../../patches/re2-2025-08-12.patch"
+  )
+  set(RE2_BUILD_TESTING OFF)
+  FetchContent_MakeAvailable(re2)
+  list(POP_BACK CMAKE_MESSAGE_INDENT)
+  message(CHECK_PASS "fetched")
+endif()
+
+
 ###############
 ##  TESTING  ##
 ###############

cmake/host.CMakeLists.txt

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

cmake/system_deps.cmake

@@ -17,14 +17,14 @@ if(NOT BUILD_absl AND NOT TARGET absl::base)
   find_package(absl REQUIRED)
 endif()
 
-if(NOT BUILD_re2 AND NOT TARGET re2::re2)
-  find_package(re2 REQUIRED)
-endif()
-
 if(NOT BUILD_Protobuf AND NOT TARGET protobuf::libprotobuf)
   find_package(Protobuf REQUIRED)
 endif()
 
+if(NOT BUILD_re2 AND NOT TARGET re2::re2)
+  find_package(re2 REQUIRED)
+endif()
+
 # CXX Test
 if(BUILD_TESTING)
   if(NOT BUILD_googletest AND NOT TARGET GTest::gtest_main)