Fix absl linking issues with protobuf

protocolbuffers/protobuf#12292 Also remove the specific protobuf version used for conda builds
man-group · Dec 3, 2024 · a126d5e · a126d5e
1 parent 9da40b9
commit a126d5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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")