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".
This commit is contained in:
Sam McCall 2022-01-29 02:19:43 +01:00
parent 7e32d2b21a
commit 93cf9640fa
5 changed files with 21 additions and 22 deletions

View File

@ -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)

View File

@ -2,11 +2,10 @@ add_clang_library(clangdRemoteMarshalling
Marshalling.cpp
LINK_LIBS
RemoteIndexProto
clangdRemoteIndexProto
clangDaemon
clangdSupport
DEPENDS
RemoteIndexProto
clangdRemoteIndexProto
)

View File

@ -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
)

View File

@ -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}

View File

@ -165,7 +165,7 @@ if (CLANGD_ENABLE_REMOTE)
target_link_libraries(ClangdTests
PRIVATE
clangdRemoteMarshalling
RemoteIndexProto)
clangdRemoteIndexProto)
endif()
if (CLANGD_BUILD_XPC)