From a126d5ea3bd5887cbe456a85bb40a01be5429527 Mon Sep 17 00:00:00 2001 From: Ivo Dilov Date: Tue, 3 Dec 2024 14:11:23 +0200 Subject: [PATCH] Fix absl linking issues with protobuf https://github.com/protocolbuffers/protobuf/issues/12292 Also remove the specific protobuf version used for conda builds --- .github/workflows/build_with_conda.yml | 1 - cpp/CMakeLists.txt | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_with_conda.yml b/.github/workflows/build_with_conda.yml index c4ef35d16ee..20270d0ff34 100644 --- a/.github/workflows/build_with_conda.yml +++ b/.github/workflows/build_with_conda.yml @@ -143,7 +143,6 @@ jobs: env: ARCTICDB_USING_CONDA: 1 ARCTICDB_BUILD_CPP_TESTS: 1 - ARCTICDB_PROTOC_VERS: "4" - name: Build C++ Tests shell: bash -l {0} diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index d1d99203195..954406b7aba 100755 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -84,6 +84,9 @@ if(WIN32) endif() else() if(${ARCTICDB_USING_CONDA}) + # Required to allow protobuf to aquire the correct version of absl: + # https://github.com/protocolbuffers/protobuf/issues/12292#issuecomment-1529680040 + find_package(protobuf REQUIRED CONFIG) # Required to be able to include headers from glog since glog 0.7 # See: https://github.com/google/glog/pull/1030 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -DGLOG_USE_GLOG_EXPORT")