From 4645ef17ff1aa30e1890b7c8230b590ef830081b Mon Sep 17 00:00:00 2001 From: Kirill Bobyrev Date: Wed, 29 Apr 2020 16:59:32 +0200 Subject: [PATCH] [clangd] Add CMake dependencies for Protobuf-generated files Summary: Dependencies ensure that Protobufs are generated before all libraries depending on the headers are **built**, not linked. Reviewers: sammccall Reviewed By: sammccall Subscribers: mgorny, ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, usaxena95, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D79085 --- clang-tools-extra/clangd/index/remote/CMakeLists.txt | 3 +++ clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt | 3 +++ clang-tools-extra/clangd/index/remote/server/CMakeLists.txt | 3 +++ 3 files changed, 9 insertions(+) diff --git a/clang-tools-extra/clangd/index/remote/CMakeLists.txt b/clang-tools-extra/clangd/index/remote/CMakeLists.txt index a358aae..81287b5 100644 --- a/clang-tools-extra/clangd/index/remote/CMakeLists.txt +++ b/clang-tools-extra/clangd/index/remote/CMakeLists.txt @@ -19,6 +19,9 @@ if (CLANGD_ENABLE_REMOTE) grpc++ clangDaemon clangdSupport + + DEPENDS + RemoteIndexProtos ) 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 0e5e513..75e57ed 100644 --- a/clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt +++ b/clang-tools-extra/clangd/index/remote/marshalling/CMakeLists.txt @@ -7,4 +7,7 @@ add_clang_library(clangdRemoteMarshalling protobuf clangDaemon clangdSupport + + DEPENDS + RemoteIndexProtos ) diff --git a/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt b/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt index 019b77e..b87541f 100644 --- a/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt +++ b/clang-tools-extra/clangd/index/remote/server/CMakeLists.txt @@ -4,6 +4,9 @@ set(LLVM_LINK_COMPONENTS ) add_clang_executable(clangd-index-server Server.cpp + + DEPENDS + RemoteIndexProtos ) target_link_libraries(clangd-index-server PRIVATE -- 2.7.4