From d96422843d7bb18e661674dcec7274925e626f61 Mon Sep 17 00:00:00 2001 From: David Sisson Date: Mon, 10 Jul 2023 10:24:17 -0700 Subject: [PATCH] Handle review notes. --- CMakeLists.txt | 3 +++ scripts/setup-ubuntu.sh | 1 - third_party/abseil-cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ffa6f08..f07d574b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,9 @@ include_directories(src) add_subdirectory(third_party) +# Due to packaging changes we use the combined protobuf/absl packaging if +# available otherwise we fallback to the older protobuf method. +# TODO: Simplify once we can require cmake 3.27 (where CONFIG is default). find_package(Protobuf QUIET CONFIG) if(NOT ${Protobuf_FOUND}) find_package(Protobuf REQUIRED) diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 332f7c02..32ff4925 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -21,7 +21,6 @@ sudo --preserve-env apt install -y \ libprotobuf-dev \ libprotobuf23 \ protobuf-compiler \ - libabsl-dev \ clang-format \ uuid-dev \ default-jre \ diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp index c2435f83..c8a2f925 160000 --- a/third_party/abseil-cpp +++ b/third_party/abseil-cpp @@ -1 +1 @@ -Subproject commit c2435f8342c2d0ed8101cb43adfd605fdc52dca2 +Subproject commit c8a2f92586fe9b4e1aff049108f5db8064924d8e