From 5408514707a0b2c7fcc35a0567c6fbf86f97a9ba Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Fri, 19 Dec 2025 15:01:19 -0800 Subject: [PATCH] [FindGRPC.cmake] Make sure that `PACKAGE_VERSION` is not overwritten when doing `find_package(gRPC)` `PACKAGE_VERSION` is important since it sets the `LLVM_VERSION_STRING` string. --- cmake/Modules/FindGRPC.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/Modules/FindGRPC.cmake b/cmake/Modules/FindGRPC.cmake index 2eec35b6a1ac7..6ad6225188e9e 100644 --- a/cmake/Modules/FindGRPC.cmake +++ b/cmake/Modules/FindGRPC.cmake @@ -16,7 +16,11 @@ find_package(Threads REQUIRED) set(protobuf_MODULE_COMPATIBLE TRUE) find_package(Protobuf CONFIG HINTS ${GRPC_INSTALL_PATH}) message(STATUS "Using protobuf ${Protobuf_VERSION}") +# There's a `c-ares` library whose CMake file sets the `PACKAGE_VERSION` variable. +# Preserve the original `PACKAGE_VERSION` value and restore it. +set(PACKAGE_VERSION_PREV "${PACKAGE_VERSION}") find_package(gRPC CONFIG HINTS ${GRPC_INSTALL_PATH}) +set(PACKAGE_VERSION "${PACKAGE_VERSION_PREV}") message(STATUS "Using gRPC ${gRPC_VERSION}") if (Protobuf_FOUND AND gRPC_FOUND)