Bump the submodule carta-protobuf (#1367)

* Include absl libraries for the new version of protobuf * bump the submodule carta-protobuf * Correct the identification of the new protobuf version * Bumped protobuf version --------- Co-authored-by: Adrianna Pińska <[email protected]>
CARTAvis · Apr 23, 2024 · 848e982 · 848e982
1 parent be2999f
commit 848e982
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -109,6 +109,17 @@ endif ()
 FIND_PACKAGE(HDF5 REQUIRED COMPONENTS CXX)
 FIND_PACKAGE(Protobuf REQUIRED)
 INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
+
+if (Protobuf_VERSION VERSION_GREATER_EQUAL "4.25.3")
+    FIND_PACKAGE(absl REQUIRED)
+    set(PROTOBUF_LIBRARY
+            ${PROTOBUF_LIBRARY}
+            absl_hash
+            absl_log_internal_message
+            absl_log_internal_nullguard)
+    message(STATUS "Newer protobuf version (${Protobuf_VERSION}) includes abseil libraries")
+endif ()
+
 FIND_PACKAGE(Threads)
 INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
 

diff --git a/carta-protobuf b/carta-protobuf