From ba395607e8bf65fd5f780e9fb7b4b60e07258db7 Mon Sep 17 00:00:00 2001 From: ganchuantao Date: Tue, 9 Sep 2025 02:22:58 +0000 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Dabseil-cpp=20=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ganchuantao --- cmake/abseil-cpp.cmake | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake index d0ede1a..14de19e 100644 --- a/cmake/abseil-cpp.cmake +++ b/cmake/abseil-cpp.cmake @@ -15,13 +15,8 @@ if(TARGET absl::strings) # (https://github.com/protocolbuffers/protobuf/issues/10435) elseif(protobuf_ABSL_PROVIDER STREQUAL "module") if(NOT ABSL_ROOT_DIR) - if (NOT EXISTS "${protobuf_SOURCE_DIR}/../../out/abseil-cpp/CMakeLists.txt") - execute_process(COMMAND ${protobuf_SOURCE_DIR}/../abseil-cpp/install_no_lock.sh ${protobuf_SOURCE_DIR}/../../out/ ${protobuf_SOURCE_DIR}/../abseil-cpp - WORKING_DIRECTORY ${protobuf_SOURCE_DIR}/../abseil-cpp - RESULT_VARIABLE result) - endif() - set(ABSL_ROOT_DIR ${protobuf_SOURCE_DIR}/../../out/abseil-cpp) - set(EXPORT_ABSL_ROOT_DIR "out/abseil-cpp" CACHE PATH "absl_root_dir") + set(ABSL_ROOT_DIR ${protobuf_SOURCE_DIR}/../../third_party/abseil-cpp) + set(EXPORT_ABSL_ROOT_DIR "third_party/abseil-cpp" CACHE PATH "absl_root_dir") endif() if(EXISTS "${ABSL_ROOT_DIR}/CMakeLists.txt") if(protobuf_INSTALL) -- Gitee