diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b8c7d2de..ae8a92aa3 100644 --- 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 index 3219acafa..202c31d25 160000 --- a/carta-protobuf +++ b/carta-protobuf @@ -1 +1 @@ -Subproject commit 3219acafa7bc454fe8d448f4dd99cef29f5ac5e8 +Subproject commit 202c31d25ec4bda97cbb9bd71fee589541872847