Author: Sam McCall Date: 2022-01-29T02:20:52+01:00 New Revision: 93cf9640fa3890aa3a4af8c4bd7c07322548b5e8
URL: https://github.com/llvm/llvm-project/commit/93cf9640fa3890aa3a4af8c4bd7c07322548b5e8 DIFF: https://github.com/llvm/llvm-project/commit/93cf9640fa3890aa3a4af8c4bd7c07322548b5e8.diff LOG: Add 'clangd' prefix to remote index proto targets Some pieces of build infrastructure (shlib, debian package) classify targets based on whether they begin with "clang". Added: Modified: clang-tools-extra/clangd/index/remote/CMakeLists.txt clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt clang-tools-extra/clangd/index/remote/monitor/CMakeLists.txt clang-tools-extra/clangd/index/remote/server/CMakeLists.txt clang-tools-extra/clangd/unittests/CMakeLists.txt Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/index/remote/CMakeLists.txt b/clang-tools-extra/clangd/index/remote/CMakeLists.txt index 5bfc241945437..3fd8930fd793b 100644 --- a/clang-tools-extra/clangd/index/remote/CMakeLists.txt +++ b/clang-tools-extra/clangd/index/remote/CMakeLists.txt @@ -1,16 +1,16 @@ if (CLANGD_ENABLE_REMOTE) - generate_protos(RemoteIndexProto "Index.proto") - generate_protos(MonitoringServiceProto "MonitoringService.proto" + generate_protos(clangdRemoteIndexProto "Index.proto") + generate_protos(clangdMonitoringServiceProto "MonitoringService.proto" GRPC) - generate_protos(RemoteIndexServiceProto "Service.proto" + generate_protos(clangdRemoteIndexServiceProto "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 + target_link_libraries(clangdRemoteIndexServiceProto PRIVATE - RemoteIndexProto - MonitoringServiceProto + clangdRemoteIndexProto + clangdMonitoringServiceProto ) include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -23,16 +23,16 @@ if (CLANGD_ENABLE_REMOTE) Client.cpp LINK_LIBS - RemoteIndexProto - RemoteIndexServiceProto + clangdRemoteIndexProto + clangdRemoteIndexServiceProto clangdRemoteMarshalling clangBasic clangDaemon clangdSupport DEPENDS - RemoteIndexProto - RemoteIndexServiceProto + clangdRemoteIndexProto + clangdRemoteIndexServiceProto ) add_subdirectory(marshalling) diff --git a/clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt b/clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt index a5f6ebd179ec9..071802a962647 100644 --- a/clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt +++ b/clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt @@ -2,11 +2,10 @@ add_clang_library(clangdRemoteMarshalling Marshalling.cpp LINK_LIBS - RemoteIndexProto - + clangdRemoteIndexProto clangDaemon clangdSupport DEPENDS - RemoteIndexProto + clangdRemoteIndexProto ) diff --git a/clang-tools-extra/clangd/index/remote/monitor/CMakeLists.txt b/clang-tools-extra/clangd/index/remote/monitor/CMakeLists.txt index 602cb3e134dd6..194c7d5128a98 100644 --- a/clang-tools-extra/clangd/index/remote/monitor/CMakeLists.txt +++ b/clang-tools-extra/clangd/index/remote/monitor/CMakeLists.txt @@ -5,7 +5,7 @@ add_clang_executable(clangd-index-server-monitor Monitor.cpp DEPENDS - RemoteIndexServiceProto + clangdRemoteIndexServiceProto ) target_link_libraries(clangd-index-server-monitor @@ -13,6 +13,6 @@ target_link_libraries(clangd-index-server-monitor clangBasic clangdSupport - MonitoringServiceProto - RemoteIndexServiceProto + clangdMonitoringServiceProto + clangdRemoteIndexServiceProto ) diff --git a/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt b/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt index f1131e53c9192..3bea34826f8a1 100644 --- a/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt +++ b/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt @@ -5,8 +5,8 @@ add_clang_executable(clangd-index-server Server.cpp DEPENDS - RemoteIndexProto - RemoteIndexServiceProto + clangdRemoteIndexProto + clangdRemoteIndexServiceProto ) target_link_libraries(clangd-index-server @@ -14,9 +14,9 @@ target_link_libraries(clangd-index-server clangDaemon clangdSupport - MonitoringServiceProto - RemoteIndexProto - RemoteIndexServiceProto + clangdMonitoringServiceProto + clangdRemoteIndexProto + clangdRemoteIndexServiceProto clangdRemoteMarshalling ${REFLECTION_LIBRARY} diff --git a/clang-tools-extra/clangd/unittests/CMakeLists.txt b/clang-tools-extra/clangd/unittests/CMakeLists.txt index 29d177435f486..88af14700ec22 100644 --- a/clang-tools-extra/clangd/unittests/CMakeLists.txt +++ b/clang-tools-extra/clangd/unittests/CMakeLists.txt @@ -165,7 +165,7 @@ if (CLANGD_ENABLE_REMOTE) target_link_libraries(ClangdTests PRIVATE clangdRemoteMarshalling - RemoteIndexProto) + clangdRemoteIndexProto) endif() if (CLANGD_BUILD_XPC) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
