[llvm] 29cecbc - Fix clangd build after 33c9dbbd380

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2020-09-10T11:05:53-04:00
New Revision: 29cecbc5d6fe2ee36635d593171d59eab631639f

URL: https://github.com/llvm/llvm-project/commit/29cecbc5d6fe2ee36635d593171d59eab631639f
DIFF: https://github.com/llvm/llvm-project/commit/29cecbc5d6fe2ee36635d593171d59eab631639f.diff

LOG: Fix clangd build after 33c9dbbd380

Added: 
    

Modified: 
    clang-tools-extra/clangd/CMakeLists.txt
    llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/clang-tools-extra/clangd/CMakeLists.txt b/clang-tools-extra/clangd/CMakeLists.txt
index 639441e8130a..3a1a034ed17b 100644
--- a/clang-tools-extra/clangd/CMakeLists.txt
+++ b/clang-tools-extra/clangd/CMakeLists.txt
@@ -33,6 +33,8 @@ if(MSVC AND NOT CLANG_CL)
  set_source_files_properties(CompileCommands.cpp PROPERTIES COMPILE_FLAGS -wd4130) # disables C4130: logical operation on address of string constant
 endif()
 
+include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../clang-tidy")
+
 add_clang_library(clangDaemon
   AST.cpp
   ClangdLSPServer.cpp

diff  --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
index 84d3f14bb2f2..7fa4cc8fd32c 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
@@ -27,6 +27,7 @@ static_library("clangd") {
     ":features",
     "//clang-tools-extra/clang-tidy",
     "//clang-tools-extra/clang-tidy:all-checks",
+    "//clang-tools-extra/clang-tidy:clang-tidy-config",
     "//clang-tools-extra/clangd/support",
     "//clang/lib/AST",
     "//clang/lib/ASTMatchers",