diff --git a/.github/workflows/build_with_conda.yml b/.github/workflows/build_with_conda.yml index 90935f91ad..a32adeb9e4 100644 --- a/.github/workflows/build_with_conda.yml +++ b/.github/workflows/build_with_conda.yml @@ -57,7 +57,6 @@ jobs: env: ARCTICDB_USING_CONDA: 1 ARCTICDB_BUILD_CPP_TESTS: 1 - ARCTICDB_PROTOC_VERS: "4" - name: Build C++ Tests shell: bash -l {0} @@ -143,7 +142,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/arcticdb/CMakeLists.txt b/cpp/arcticdb/CMakeLists.txt index d4df81e05e..f7ca660960 100644 --- a/cpp/arcticdb/CMakeLists.txt +++ b/cpp/arcticdb/CMakeLists.txt @@ -32,7 +32,9 @@ if(NOT WIN32 AND ${SSL_LINK}) find_package(Kerberos REQUIRED) endif() -find_package(Protobuf REQUIRED) +# Required to allow protobuf to use the correct version of absl: +# https://github.com/protocolbuffers/protobuf/issues/12292#issuecomment-1529680040 +find_package(protobuf REQUIRED CONFIG) find_package(mongocxx REQUIRED) find_package(bsoncxx REQUIRED) find_package(xxHash REQUIRED)