Update abseil-cpp.cmake (#10436)

2 years ago · 6affd51405
parent d8421bd49c
commit 6affd51405
1 changed files with 4 additions and 1 deletions
--- a/cmake/abseil-cpp.cmake
+++ b/cmake/abseil-cpp.cmake
@ -2,7 +2,10 @@

 set(ABSL_PROPAGATE_CXX_STD ON)

-if(protobuf_ABSL_PROVIDER STREQUAL "module")
+if(TARGET absl::strings)
+  # If Abseil is included already, skip including it.
+  # (https://github.com/protocolbuffers/protobuf/issues/10435)
+elseif(protobuf_ABSL_PROVIDER STREQUAL "module")
  if(NOT ABSL_ROOT_DIR)
    set(ABSL_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/abseil-cpp)
  endif()