[clang-tools-extra] [cmake] Link against libclang-cpp whenever possible

[mgorny]

Summary

Use clang_target_link_libraries() in order to support linking against
libclang-cpp instead of static libraries.

[sylvestre.ledru]

I don't think I can review that but I do appreciate the feature!
Maybe we should make that explicit in the release notes?

[mgorny]

What do you mean by 'feature'? clang-cpp library or clang_target_link_libraries function?

[sylvestre.ledru]

More dynamic, less static usage :)

[beanz]

LGTM.

[beanz]

In D68448#1694284, @sylvestre.ledru wrote:

More dynamic, less static usage :)

More dynamic, less static isn't always a good thing. It saves disk space at the expense of performance. The option that controls this is CLANG_LINK_CLANG_DYLIB, which is mentioned in the clang 9.0 release notes.

[sylvestre.ledru]

More dynamic, less static isn't always a good thing. It saves disk space at the expense of performance. The option that controls this is CLANG_LINK_CLANG_DYLIB, which is mentioned in the clang 9.0 release notes.

Sure :)
For example, for a full build of llvm-toolchain, all the packages size drop from 510M to 278M

clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Support
   )
 
 add_clang_tool(clang-apply-replacements
   ClangApplyReplacementsMain.cpp
   )
-target_link_libraries(clang-apply-replacements
+clang_target_link_libraries(clang-apply-replacements
   PRIVATE
-  clangApplyReplacements
   clangBasic
   clangFormat
   clangRewrite
   clangToolingCore
   clangToolingRefactoring
   )
+target_link_libraries(clang-apply-replacements
+  PRIVATE
+  clangApplyReplacements
+  )

clang-tools-extra/clang-change-namespace/tool/CMakeLists.txt

 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 set(LLVM_LINK_COMPONENTS
   Support
   )
 
 add_clang_tool(clang-change-namespace
   ClangChangeNamespace.cpp
   )
-target_link_libraries(clang-change-namespace
+clang_target_link_libraries(clang-change-namespace
   PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
-  clangChangeNamespace
   clangFormat
   clangFrontend
   clangRewrite
   clangSerialization
   clangTooling
   clangToolingCore
   )
+target_link_libraries(clang-change-namespace
+  PRIVATE
+  clangChangeNamespace
+  )

clang-tools-extra/clang-doc/tool/CMakeLists.txt

 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 add_clang_tool(clang-doc
   ClangDocMain.cpp
   )
 
-target_link_libraries(clang-doc
+clang_target_link_libraries(clang-doc
   PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
   clangFrontend
-  clangDoc
   clangTooling
   clangToolingCore
   )
+target_link_libraries(clang-doc
+  PRIVATE
+  clangDoc
+  )
 
 install(FILES ../assets/clang-doc-default-stylesheet.css
   DESTINATION share/clang
   COMPONENT clang-doc)
 
 install(FILES ../assets/index.js
   DESTINATION share/clang
   COMPONENT clang-doc)

clang-tools-extra/clang-include-fixer/find-all-symbols/tool/CMakeLists.txt

 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 add_clang_tool(find-all-symbols
   FindAllSymbolsMain.cpp
   )
 
-target_link_libraries(find-all-symbols
+clang_target_link_libraries(find-all-symbols
   PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
   clangFrontend
   clangLex
   clangSerialization
   clangTooling
+  )
+target_link_libraries(find-all-symbols
+  PRIVATE
   findAllSymbols
   )
 
 install(PROGRAMS run-find-all-symbols.py
   DESTINATION share/clang
   COMPONENT find-all-symbols)

clang-tools-extra/clang-include-fixer/tool/CMakeLists.txt

 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 add_clang_tool(clang-include-fixer
   ClangIncludeFixer.cpp
   )
 
-target_link_libraries(clang-include-fixer
+clang_target_link_libraries(clang-include-fixer
   PRIVATE
   clangBasic
   clangFormat
   clangFrontend
-  clangIncludeFixer
   clangRewrite
   clangSerialization
   clangTooling
   clangToolingCore
+  )
+target_link_libraries(clang-include-fixer
+  PRIVATE
+  clangIncludeFixer
   findAllSymbols
   )
 
 install(PROGRAMS clang-include-fixer.el
   DESTINATION share/clang
   COMPONENT clang-include-fixer)
 install(PROGRAMS clang-include-fixer.py
   DESTINATION share/clang
   COMPONENT clang-include-fixer)

clang-tools-extra/clang-move/tool/CMakeLists.txt

 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 add_clang_tool(clang-move
   ClangMove.cpp
   )
 
-target_link_libraries(clang-move
+clang_target_link_libraries(clang-move
   PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
   clangFormat
   clangFrontend
-  clangMove
   clangRewrite
   clangSerialization
   clangTooling
   clangToolingCore
   )
+target_link_libraries(clang-move
+  PRIVATE
+  clangMove
+  )

clang-tools-extra/clang-query/tool/CMakeLists.txt

 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 add_clang_tool(clang-query
   ClangQuery.cpp
   )
-target_link_libraries(clang-query
+clang_target_link_libraries(clang-query
   PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
   clangDynamicASTMatchers
   clangFrontend
-  clangQuery
   clangSerialization
   clangTooling
   )
+target_link_libraries(clang-query
+  PRIVATE
+  clangQuery
+  )

clang-tools-extra/clang-reorder-fields/tool/CMakeLists.txt

 add_clang_tool(clang-reorder-fields
   ClangReorderFields.cpp
   )
 
-target_link_libraries(clang-reorder-fields
+clang_target_link_libraries(clang-reorder-fields
   PRIVATE
   clangBasic
   clangFrontend
-  clangReorderFields
   clangRewrite
   clangSerialization
   clangTooling
   clangToolingCore
   )
+target_link_libraries(clang-reorder-fields
+  PRIVATE
+  clangReorderFields
+  )

clang-tools-extra/clang-tidy/CMakeLists.txt

add_clang_library(clangTidy
   clangRewrite
   clangSema
   clangSerialization
   clangTooling
   clangToolingCore
   )
 
 if(CLANG_ENABLE_STATIC_ANALYZER)
-  target_link_libraries(clangTidy PRIVATE
+  clang_target_link_libraries(clangTidy PRIVATE
     clangStaticAnalyzerCore
     clangStaticAnalyzerFrontend
   )
 endif()
 
 # Checks.
 # If you add a check, also add it to ClangTidyForceLinker.h in this directory.
 add_subdirectory(android)

clang-tools-extra/clang-tidy/tool/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   AllTargetsAsmParsers
   AllTargetsDescs
   AllTargetsInfos
   support
   )
 
 add_clang_tool(clang-tidy
   ClangTidyMain.cpp
   )
 add_dependencies(clang-tidy
   clang-resource-headers
   )
-target_link_libraries(clang-tidy
+clang_target_link_libraries(clang-tidy
   PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
-  clangTidy
   clangTooling
   clangToolingCore
+  )
+target_link_libraries(clang-tidy
+  PRIVATE
+  clangTidy
   ${ALL_CLANG_TIDY_CHECKS}
   )
 
 
 install(PROGRAMS clang-tidy-diff.py
   DESTINATION share/clang
   COMPONENT clang-tidy)
 install(PROGRAMS run-clang-tidy.py
   DESTINATION share/clang
   COMPONENT clang-tidy)

clang-tools-extra/clangd/fuzzer/CMakeLists.txt

 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_CURRENT_BINARY_DIR}/..)
 
 set(LLVM_LINK_COMPONENTS
   FuzzMutate
   Support
   )
 
 # This fuzzer runs on oss-fuzz, so keep it around even if it looks unreferenced.
 add_llvm_fuzzer(clangd-fuzzer
   clangd-fuzzer.cpp
   DUMMY_MAIN DummyClangdMain.cpp
   )
 
-target_link_libraries(clangd-fuzzer
+clang_target_link_libraries(clangd-fuzzer
   PRIVATE
   clangBasic
-  clangDaemon
   clangFormat
   clangFrontend
   clangSema
   clangTooling
   clangToolingCore
   )
+target_link_libraries(clangd-fuzzer
+  PRIVATE
+  clangDaemon
+  )

clang-tools-extra/clangd/index/dex/dexp/CMakeLists.txt

 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
 
 set(LLVM_LINK_COMPONENTS
   LineEditor
   Support
   )
 
 add_clang_executable(dexp
   Dexp.cpp
   )
 
-target_link_libraries(dexp
+clang_target_link_libraries(dexp
   PRIVATE
   clangBasic
+  )
+target_link_libraries(dexp
+  PRIVATE
   clangDaemon
   )

clang-tools-extra/clangd/indexer/CMakeLists.txt

 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
 
 set(LLVM_LINK_COMPONENTS
     Support
     )
 
 add_clang_executable(clangd-indexer
   IndexerMain.cpp
   )
 
-target_link_libraries(clangd-indexer
+clang_target_link_libraries(clangd-indexer
   PRIVATE
   clangAST
   clangBasic
-  clangDaemon
   clangFrontend
   clangIndex
   clangLex
   clangTooling
 )
+target_link_libraries(clangd-indexer
+  PRIVATE
+  clangDaemon
+)

clang-tools-extra/clangd/tool/CMakeLists.txt

set(LLVM_LINK_COMPONENTS
   support
   )
 
 set(CLANGD_XPC_LIBS "")
 if(CLANGD_BUILD_XPC)
   list(APPEND CLANGD_XPC_LIBS "clangdXpcJsonConversions" "clangdXpcTransport")
 endif()
 
-target_link_libraries(clangd
+clang_target_link_libraries(clangd
   PRIVATE
   clangAST
   clangBasic
-  clangTidy
-  clangDaemon
   clangFormat
   clangFrontend
   clangSema
   clangTooling
   clangToolingCore
   clangToolingRefactoring
   clangToolingSyntax
+  )
+target_link_libraries(clangd
+  PRIVATE
+  clangTidy
+  clangDaemon
   ${CLANGD_XPC_LIBS}
   )

clang-tools-extra/clangd/unittests/CMakeLists.txt

add_unittest(ClangdUnitTests ClangdTests
   TweakTests.cpp
   TweakTesting.cpp
   URITests.cpp
   XRefsTests.cpp
 
   $<TARGET_OBJECTS:obj.clangDaemonTweaks>
   )
 
-target_link_libraries(ClangdTests
+clang_target_link_libraries(ClangdTests
   PRIVATE
   clangAST
   clangBasic
-  clangDaemon
   clangFormat
   clangFrontend
   clangIndex
   clangLex
   clangSema
   clangSerialization
-  clangTidy
   clangTooling
   clangToolingCore
   clangToolingInclusions
   clangToolingRefactoring
   clangToolingSyntax
+  )
+target_link_libraries(ClangdTests
+  PRIVATE
+  clangDaemon
+  clangTidy
   LLVMSupport
   LLVMTestingSupport
   )
 
 if (CLANGD_BUILD_XPC)
   add_subdirectory(xpc)
 endif ()
 
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py)

clang-tools-extra/clangd/xpc/test-client/CMakeLists.txt

 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/../../
 )
 
 add_clang_tool(
   clangd-xpc-test-client
   ClangdXPCTestClient.cpp
 
   DEPENDS ClangdXPC
 )
 
 set(LLVM_LINK_COMPONENTS
     support
 )
 
-target_link_libraries(clangd-xpc-test-client
+clang_target_link_libraries(clangd-xpc-test-client
   PRIVATE
   clangBasic
-  clangDaemon
   clangFormat
   clangFrontend
   clangSema
   clangTooling
   clangToolingCore
+)
+target_link_libraries(clangd-xpc-test-client
+  PRIVATE
+  clangDaemon
   clangdXpcJsonConversions
 )

clang-tools-extra/modularize/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Option
   Support
   )
 
 add_clang_tool(modularize
   Modularize.cpp
   ModuleAssistant.cpp
   ModularizeUtilities.cpp
   CoverageChecker.cpp
   PreprocessorTracker.cpp
   )
 
-target_link_libraries(modularize
+clang_target_link_libraries(modularize
   PRIVATE
   clangAST
   clangBasic
   clangDriver
   clangFrontend
   clangLex
   clangSerialization
   clangTooling
   )
 
 install(TARGETS modularize
         RUNTIME DESTINATION bin
         COMPONENT clang-extras)

clang-tools-extra/pp-trace/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Support
   )
 
 add_clang_tool(pp-trace
   PPTrace.cpp
   PPCallbacksTracker.cpp
   )
 
-target_link_libraries(pp-trace
+clang_target_link_libraries(pp-trace
   PRIVATE
   clangAST
   clangBasic
   clangFrontend
   clangLex
   clangSerialization
   clangTooling
   )

clang-tools-extra/tool-template/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Support
   )
 
 add_clang_executable(tool-template
   ToolTemplate.cpp
   )
 
-target_link_libraries(tool-template
+clang_target_link_libraries(tool-template
   PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
   clangFrontend
   clangTooling
   clangToolingRefactoring
   )

clang-tools-extra/unittests/clang-apply-replacements/CMakeLists.txt

 get_filename_component(ClangApplyReplacementsLocation
   "${CMAKE_CURRENT_SOURCE_DIR}/../../clang-apply-replacements/include" REALPATH)
 get_filename_component(CommonIncLocation
   "${CMAKE_CURRENT_SOURCE_DIR}/../include" REALPATH)
 include_directories(
   ${ClangApplyReplacementsLocation}
   ${CommonIncLocation}
   )
 
 add_extra_unittest(ClangApplyReplacementsTests
   ApplyReplacementsTest.cpp
   )
 
-target_link_libraries(ClangApplyReplacementsTests
+clang_target_link_libraries(ClangApplyReplacementsTests
   PRIVATE
-  clangApplyReplacements
   clangBasic
   clangToolingCore
   clangToolingRefactoring
   )
+target_link_libraries(ClangApplyReplacementsTests
+  PRIVATE
+  clangApplyReplacements
+  )

clang-tools-extra/unittests/clang-change-namespace/CMakeLists.txt

 
 # We'd like clang/unittests/Tooling/RewriterTestContext.h in the test.
 include_directories(${CLANG_SOURCE_DIR})
 
 add_extra_unittest(ClangChangeNamespaceTests
   ChangeNamespaceTests.cpp
   )
 
-target_link_libraries(ClangChangeNamespaceTests
+clang_target_link_libraries(ClangChangeNamespaceTests
   PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
-  clangChangeNamespace
   clangFormat
   clangFrontend
   clangRewrite
   clangSerialization
   clangTooling
   clangToolingCore
   )
+target_link_libraries(ClangChangeNamespaceTests
+  PRIVATE
+  clangChangeNamespace
+  )

clang-tools-extra/unittests/clang-doc/CMakeLists.txt

add_extra_unittest(ClangDocTests
   GeneratorTest.cpp
   HTMLGeneratorTest.cpp
   MDGeneratorTest.cpp
   MergeTest.cpp
   SerializeTest.cpp
   YAMLGeneratorTest.cpp
   )
 
-target_link_libraries(ClangDocTests
+clang_target_link_libraries(ClangDocTests
   PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
-  clangDoc
   clangFormat
   clangFrontend
   clangRewrite
   clangSerialization
   clangTooling
   clangToolingCore
   )
+target_link_libraries(ClangDocTests
+  PRIVATE
+  clangDoc
+  )

clang-tools-extra/unittests/clang-include-fixer/CMakeLists.txt

 # We'd like to clang/unittests/Tooling/RewriterTestContext.h in the test.
 include_directories(${CLANG_SOURCE_DIR})
 
 add_extra_unittest(ClangIncludeFixerTests
   IncludeFixerTest.cpp
   FuzzySymbolIndexTests.cpp
   )
 
-target_link_libraries(ClangIncludeFixerTests
+clang_target_link_libraries(ClangIncludeFixerTests
   PRIVATE
   clangBasic
   clangFormat
   clangFrontend
-  clangIncludeFixer
   clangRewrite
   clangSerialization
   clangTooling
   clangToolingCore
+  )
+target_link_libraries(ClangIncludeFixerTests
+  PRIVATE
+  clangIncludeFixer
   findAllSymbols
   )
 
 add_subdirectory(find-all-symbols)

clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   support
   )
 
 get_filename_component(INCLUDE_FIXER_SOURCE_DIR
   ${CMAKE_CURRENT_SOURCE_DIR}/../../../clang-include-fixer/find-all-symbols REALPATH)
 include_directories(
   ${INCLUDE_FIXER_SOURCE_DIR}
   )
 
 add_extra_unittest(FindAllSymbolsTests
   FindAllSymbolsTests.cpp
   )
 
-target_link_libraries(FindAllSymbolsTests
+clang_target_link_libraries(FindAllSymbolsTests
   PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
   clangFrontend
   clangLex
   clangSerialization
   clangTooling
+  )
+target_link_libraries(FindAllSymbolsTests
+  PRIVATE
   findAllSymbols
   )

clang-tools-extra/unittests/clang-move/CMakeLists.txt

 
 # We'd like to clang/unittests/Tooling/RewriterTestContext.h in the test.
 include_directories(${CLANG_SOURCE_DIR})
 
 add_extra_unittest(ClangMoveTests
   ClangMoveTests.cpp
   )
 
-target_link_libraries(ClangMoveTests
+clang_target_link_libraries(ClangMoveTests
   PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
   clangFormat
   clangFrontend
-  clangMove
   clangRewrite
   clangSerialization
   clangTooling
   clangToolingCore
   )
+target_link_libraries(ClangMoveTests
+  PRIVATE
+  clangMove
+  )

clang-tools-extra/unittests/clang-query/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   support
   )
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/../../clang-query
   )
 
 add_extra_unittest(ClangQueryTests
   QueryEngineTest.cpp
   QueryParserTest.cpp
   )
 
-target_link_libraries(ClangQueryTests
+clang_target_link_libraries(ClangQueryTests
   PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
   clangDynamicASTMatchers
   clangFrontend
-  clangQuery
   clangSerialization
   clangTooling
   )
+target_link_libraries(ClangQueryTests
+  PRIVATE
+  clangQuery
+  )

clang-tools-extra/unittests/clang-tidy/CMakeLists.txt

add_extra_unittest(ClangTidyTests
   NamespaceAliaserTest.cpp
   ObjCModuleTest.cpp
   OverlappingReplacementsTest.cpp
   UsingInserterTest.cpp
   ReadabilityModuleTest.cpp
   TransformerClangTidyCheckTest.cpp
   )
 
-target_link_libraries(ClangTidyTests
+clang_target_link_libraries(ClangTidyTests
   PRIVATE
   clangAST
   clangASTMatchers
   clangBasic
   clangFrontend
   clangLex
   clangSerialization
+  clangTooling
+  clangToolingCore
+  clangToolingRefactoring
+  )
+target_link_libraries(ClangTidyTests
+  PRIVATE
   clangTidy
   clangTidyAndroidModule
   clangTidyGoogleModule
   clangTidyLLVMModule
   clangTidyObjCModule
   clangTidyReadabilityModule
   clangTidyUtils
-  clangTooling
-  clangToolingCore
-  clangToolingRefactoring
   )