[PATCH] D94479: [clangd] Extend hints for gRPC and Protobuf CMake config paths

[Kirill Bobyrev via Phabricator via llvm-commits]

kbobyrev created this revision.
kbobyrev added a reviewer: sammccall.
Herald added subscribers: usaxena95, kadircet, arphaman, mgorny.
kbobyrev requested review of this revision.
Herald added subscribers: llvm-commits, MaskRay, ilya-biryukov.
Herald added a project: LLVM.

Otherwise CMake can't find respective libraries in Ubuntu 20.04 causing our
builds to fail:

https://github.com/clangd/clangd/runs/1678096007

Resolves: https://github.com/clangd/clangd/issues/641


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D94479

Files:
  llvm/cmake/modules/FindGRPC.cmake


Index: llvm/cmake/modules/FindGRPC.cmake
===================================================================
--- llvm/cmake/modules/FindGRPC.cmake
+++ llvm/cmake/modules/FindGRPC.cmake
@@ -9,9 +9,9 @@
   # it's On (NOTE: This is a variable passed to gRPC CMake build invocation,
   # LLVM's BUILD_SHARED_LIBS has no effect).
   set(protobuf_MODULE_COMPATIBLE TRUE)
-  find_package(Protobuf CONFIG REQUIRED HINTS ${GRPC_INSTALL_PATH})
+  find_package(Protobuf CONFIG REQUIRED HINTS ${GRPC_INSTALL_PATH}/lib/cmake/protobuf)
   message(STATUS "Using protobuf ${protobuf_VERSION}")
-  find_package(gRPC CONFIG REQUIRED HINTS ${GRPC_INSTALL_PATH})
+  find_package(gRPC CONFIG REQUIRED HINTS ${GRPC_INSTALL_PATH}/lib/cmake/grpc)
   message(STATUS "Using gRPC ${gRPC_VERSION}")
 
   include_directories(${Protobuf_INCLUDE_DIRS})


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D94479.316028.patch
Type: text/x-patch
Size: 822 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210112/b0daeddc/attachment.bin>