[clang-tools-extra] 5dd3992 - [clangd] Fix remote-server build and add it to check-clangd

[Kadir Cetinkaya via cfe-commits]

Author: Kadir Cetinkaya
Date: 2020-10-23T18:08:02+02:00
New Revision: 5dd39923a09ec284d30083e5fadaa29e618d4446

URL: https://github.com/llvm/llvm-project/commit/5dd39923a09ec284d30083e5fadaa29e618d4446
DIFF: https://github.com/llvm/llvm-project/commit/5dd39923a09ec284d30083e5fadaa29e618d4446.diff

LOG: [clangd] Fix remote-server build and add it to check-clangd

Differential Revision: https://reviews.llvm.org/D90047

Added: 
    

Modified: 
    clang-tools-extra/clangd/index/remote/server/Server.cpp
    clang-tools-extra/clangd/test/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clangd/index/remote/server/Server.cpp b/clang-tools-extra/clangd/index/remote/server/Server.cpp
index 750c659381af..7b68549a4afd 100644
--- a/clang-tools-extra/clangd/index/remote/server/Server.cpp
+++ b/clang-tools-extra/clangd/index/remote/server/Server.cpp
@@ -33,8 +33,6 @@
 #include <memory>
 #include <thread>
 
-#include "Index.grpc.pb.h"
-
 namespace clang {
 namespace clangd {
 namespace remote {

diff  --git a/clang-tools-extra/clangd/test/CMakeLists.txt b/clang-tools-extra/clangd/test/CMakeLists.txt
index 878408cc5483..ade42ac457e0 100644
--- a/clang-tools-extra/clangd/test/CMakeLists.txt
+++ b/clang-tools-extra/clangd/test/CMakeLists.txt
@@ -21,6 +21,10 @@ if(CLANGD_BUILD_XPC)
   list(APPEND CLANGD_TEST_DEPS ClangdXpcUnitTests)
 endif()
 
+if(CLANGD_ENABLE_REMOTE)
+  list(APPEND CLANGD_TEST_DEPS clangd-index-server)
+endif()
+
 foreach(dep FileCheck count not llvm-config)
   if(TARGET ${dep})
     list(APPEND CLANGD_TEST_DEPS ${dep})