[PATCH] D84928: [clangd] Fix remote index build on macOS
Kirill Bobyrev via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Fri Jul 31 05:03:26 PDT 2020
This revision was not accepted when it landed; it landed in state "Needs Review".
This revision was automatically updated to reflect the committed changes.
Closed by commit rG2978b10aa164: [clangd] Fix remote index build on macOS (authored by kbobyrev).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D84928/new/
https://reviews.llvm.org/D84928
Files:
llvm/cmake/modules/FindGRPC.cmake
Index: llvm/cmake/modules/FindGRPC.cmake
===================================================================
--- llvm/cmake/modules/FindGRPC.cmake
+++ llvm/cmake/modules/FindGRPC.cmake
@@ -45,11 +45,25 @@
# system path.
if (GRPC_HOMEBREW_RETURN_CODE EQUAL "0")
include_directories(${GRPC_HOMEBREW_PATH}/include)
- link_directories(${GRPC_HOMEBREW_PATH}/lib)
+ find_library(GRPC_LIBRARY
+ grpc++
+ PATHS ${GRPC_HOMEBREW_PATH}/lib
+ NO_DEFAULT_PATH
+ REQUIRED)
+ add_library(grpc++ UNKNOWN IMPORTED GLOBAL)
+ set_target_properties(grpc++ PROPERTIES
+ IMPORTED_LOCATION ${GRPC_LIBRARY})
endif()
if (PROTOBUF_HOMEBREW_RETURN_CODE EQUAL "0")
include_directories(${PROTOBUF_HOMEBREW_PATH}/include)
- link_directories(${PROTOBUF_HOMEBREW_PATH}/lib)
+ find_library(PROTOBUF_LIBRARY
+ protobuf
+ PATHS ${PROTOBUF_HOMEBREW_PATH}/lib
+ NO_DEFAULT_PATH
+ REQUIRED)
+ add_library(protobuf UNKNOWN IMPORTED GLOBAL)
+ set_target_properties(protobuf PROPERTIES
+ IMPORTED_LOCATION ${PROTOBUF_LIBRARY})
endif()
endif()
endif()
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D84928.282193.patch
Type: text/x-patch
Size: 1345 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200731/8ef1a9b7/attachment.bin>
More information about the llvm-commits
mailing list