kadircet updated this revision to Diff 307281.
kadircet added a comment.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
- Link protobuf and grpc++ publicly to generated targets
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D91859/new/
https://reviews.llvm.org/D91859
Files:
clang-tools-extra/clangd/CMakeLists.txt
clang-tools-extra/clangd/index/remote/CMakeLists.txt
clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt
clang-tools-extra/clangd/index/remote/server/CMakeLists.txt
clang-tools-extra/clangd/unittests/CMakeLists.txt
llvm/cmake/modules/FindGRPC.cmake
Index: llvm/cmake/modules/FindGRPC.cmake
===================================================================
--- llvm/cmake/modules/FindGRPC.cmake
+++ llvm/cmake/modules/FindGRPC.cmake
@@ -112,7 +112,7 @@
add_clang_library(${LibraryName} ${GeneratedProtoSource}
PARTIAL_SOURCES_INTENDED
- LINK_LIBS grpc++ protobuf)
+ LINK_LIBS PUBLIC grpc++ protobuf)
# Ensure dependency headers are generated before dependent protos are built.
# DEPENDS arg is a list of "Foo.proto". While they're logically relative to
Index: clang-tools-extra/clangd/unittests/CMakeLists.txt
===================================================================
--- clang-tools-extra/clangd/unittests/CMakeLists.txt
+++ clang-tools-extra/clangd/unittests/CMakeLists.txt
@@ -146,7 +146,8 @@
if (CLANGD_ENABLE_REMOTE)
target_link_libraries(ClangdTests
PRIVATE
- clangdRemoteMarshalling)
+ clangdRemoteMarshalling
+ RemoteIndexProto)
endif()
if (CLANGD_BUILD_XPC)
Index: clang-tools-extra/clangd/index/remote/server/CMakeLists.txt
===================================================================
--- clang-tools-extra/clangd/index/remote/server/CMakeLists.txt
+++ clang-tools-extra/clangd/index/remote/server/CMakeLists.txt
@@ -17,6 +17,4 @@
RemoteIndexProto
RemoteIndexServiceProto
clangdRemoteMarshalling
-
- grpc++
)
Index: clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt
===================================================================
--- clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt
+++ clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt
@@ -4,7 +4,6 @@
LINK_LIBS
RemoteIndexProto
- protobuf
clangDaemon
clangdSupport
Index: clang-tools-extra/clangd/index/remote/CMakeLists.txt
===================================================================
--- clang-tools-extra/clangd/index/remote/CMakeLists.txt
+++ clang-tools-extra/clangd/index/remote/CMakeLists.txt
@@ -3,6 +3,12 @@
generate_protos(RemoteIndexServiceProto "Service.proto"
DEPENDS "Index.proto"
GRPC)
+ # FIXME: Move this into generate_protos. Currently we only mention proto
+ # filename as a dependency, but linking requires target name.
+ target_link_libraries(RemoteIndexServiceProto
+ PRIVATE
+ RemoteIndexProto
+ )
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../)
@@ -18,8 +24,8 @@
RemoteIndexProto
RemoteIndexServiceProto
clangdRemoteMarshalling
- protobuf
- grpc++
+ clangBasic
+ clangDaemon
clangdSupport
DEPENDS
Index: clang-tools-extra/clangd/CMakeLists.txt
===================================================================
--- clang-tools-extra/clangd/CMakeLists.txt
+++ clang-tools-extra/clangd/CMakeLists.txt
@@ -168,17 +168,18 @@
add_subdirectory(xpc)
endif ()
+if (CLANGD_ENABLE_REMOTE)
+ include(FindGRPC)
+endif()
+
if(CLANG_INCLUDE_TESTS)
-add_subdirectory(test)
-add_subdirectory(unittests)
+ add_subdirectory(test)
+ add_subdirectory(unittests)
endif()
# FIXME(kirillbobyrev): Document this in the LLVM docs once remote index is stable.
option(CLANGD_ENABLE_REMOTE "Use gRPC library to enable remote index support for Clangd" OFF)
set(GRPC_INSTALL_PATH "" CACHE PATH "Path to gRPC library manual installation.")
-if (CLANGD_ENABLE_REMOTE)
- include(FindGRPC)
-endif()
add_subdirectory(index/remote)
add_subdirectory(index/dex/dexp)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
