diff --git a/clang-tools-extra/clangd/index/remote/CMakeLists.txt b/clang-tools-extra/clangd/index/remote/CMakeLists.txt
--- a/clang-tools-extra/clangd/index/remote/CMakeLists.txt
+++ b/clang-tools-extra/clangd/index/remote/CMakeLists.txt
@@ -19,6 +19,7 @@
     grpc++
     clangDaemon
     )
+  add_dependencies(clangdRemoteIndex RemoteIndexProtos)
 
   add_subdirectory(marshalling)
   add_subdirectory(server)
diff --git a/clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt b/clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt
--- a/clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt
+++ b/clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt
@@ -7,3 +7,4 @@
   protobuf
   clangDaemon
   )
+add_dependencies(clangdRemoteMarshalling RemoteIndexProtos)
diff --git a/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt b/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt
--- a/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt
+++ b/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt
@@ -14,3 +14,4 @@
 
   grpc++
   )
+add_dependencies(clangd-index-server RemoteIndexProtos)