[clangd] Fix remote index build without shared libs mode

[kbobyrev]

Summary

Generated Protobuf library has to be in CLANG_EXPORTS and should also be
installed appropriately. The easiest way to do that is via CMake's
add_clang_library. That unfortunately applies "one directory - one
clang_(library|tool)" policy so .proto files should be in a separate directory
and complicates the layout.

This setup works both in shared and static libs mode.

Resolves: https://github.com/clangd/clangd/issues/351

[kbobyrev]

Slightly adjust the CMake scripts.

[kbobyrev]

Don't create a separate directory for proto files.

[sammccall]

clang-tools-extra/clangd/index/remote/CMakeLists.txt

22 ↗

(On Diff #260606)

would be nice to avoid specifying this here if it's not needed

clang-tools-extra/clangd/index/remote/server/CMakeLists.txt

8

why this removal?

llvm/cmake/modules/AddLLVM.cmake

412 ↗

(On Diff #260606)

why do you need to parse this and then explicitly pass it through, rather than just letting it fall into ARG_UNPARSED_ARGUMENTS?

llvm/cmake/modules/LLVMProcessSources.cmake

60

This name could be better, I think.

What about PARTIAL_SOURCES_INTENDED?

[kbobyrev]

Address review comments.

clang-tools-extra/clangd/index/remote/server/CMakeLists.txt

8

Discussed in the chat.

[sammccall]

clang-tools-extra/clangd/index/remote/server/CMakeLists.txt

8

For the record: redundant with parent package (this is a cleanup-while-here)

clang-tools-extra/clangd/index/remote/server/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   LineEditor
   Support
   )
 add_clang_executable(clangd-index-server
   Server.cpp
   )
-target_compile_definitions(clangd-index-server PRIVATE -D GOOGLE_PROTOBUF_NO_RTTI=1)
-clang_target_link_libraries(clangd-index-server
-  PRIVATE
-  clangDaemon
-  )
 target_link_libraries(clangd-index-server
   PRIVATE
-  RemoteIndexProtos
+  clangDaemon
 
+  RemoteIndexProtos
   clangdRemoteMarshalling
+
+  grpc++
   )

llvm/cmake/modules/FindGRPC.cmake

add_custom_command(
         COMMAND ${PROTOC}
         ARGS --grpc_out="${CMAKE_CURRENT_BINARY_DIR}"
           --cpp_out="${CMAKE_CURRENT_BINARY_DIR}"
           --proto_path="${ProtoSourcePath}"
           --plugin=protoc-gen-grpc="${GRPC_CPP_PLUGIN}"
           "${ProtoSourceAbsolutePath}"
           DEPENDS "${ProtoSourceAbsolutePath}")
 
-  add_library(${LibraryName} ${GeneratedProtoSource} ${GeneratedGRPCSource})
-  target_link_libraries(${LibraryName} grpc++ protobuf)
+  add_clang_library(${LibraryName} ${GeneratedProtoSource} ${GeneratedGRPCSource}
+    PARTIAL_SOURCES_INTENDED
+    LINK_LIBS grpc++ protobuf)
 endfunction()

llvm/cmake/modules/LLVMProcessSources.cmake

foreach(additional_dir ${additional_headerdirs})
     list(APPEND all_headers ${hds})
   endforeach(additional_dir)
 
   set( ${hdrs_out} ${all_headers} PARENT_SCOPE )
 endfunction(find_all_header_files)
 
 
 function(llvm_process_sources OUT_VAR)
-  cmake_parse_arguments(ARG "" "" "ADDITIONAL_HEADERS;ADDITIONAL_HEADER_DIRS" ${ARGN})
+  cmake_parse_arguments(ARG "PARTIAL_SOURCES_INTENDED" "" "ADDITIONAL_HEADERS;ADDITIONAL_HEADER_DIRS" ${ARGN})
   set(sources ${ARG_UNPARSED_ARGUMENTS})
-  llvm_check_source_file_list( ${sources} )
-  
+  if (NOT ARG_PARTIAL_SOURCES_INTENDED)
+    llvm_check_source_file_list(${sources})
+  endif()
   # This adds .td and .h files to the Visual Studio solution:
   add_td_sources(sources)
   find_all_header_files(hdrs "${ARG_ADDITIONAL_HEADER_DIRS}")
   if (hdrs)
     set_source_files_properties(${hdrs} PROPERTIES HEADER_FILE_ONLY ON)
   endif()
   set_source_files_properties(${ARG_ADDITIONAL_HEADERS} PROPERTIES HEADER_FILE_ONLY ON)
   list(APPEND sources ${ARG_ADDITIONAL_HEADERS} ${hdrs})