Index: clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt =================================================================== --- clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt +++ clang-tools-extra/clang-apply-replacements/tool/CMakeLists.txt @@ -5,12 +5,15 @@ 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 + ) Index: clang-tools-extra/clang-change-namespace/tool/CMakeLists.txt =================================================================== --- clang-tools-extra/clang-change-namespace/tool/CMakeLists.txt +++ clang-tools-extra/clang-change-namespace/tool/CMakeLists.txt @@ -7,12 +7,11 @@ 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 @@ -20,3 +19,7 @@ clangTooling clangToolingCore ) +target_link_libraries(clang-change-namespace + PRIVATE + clangChangeNamespace + ) Index: clang-tools-extra/clang-doc/tool/CMakeLists.txt =================================================================== --- clang-tools-extra/clang-doc/tool/CMakeLists.txt +++ clang-tools-extra/clang-doc/tool/CMakeLists.txt @@ -4,16 +4,19 @@ 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 Index: clang-tools-extra/clang-include-fixer/find-all-symbols/tool/CMakeLists.txt =================================================================== --- clang-tools-extra/clang-include-fixer/find-all-symbols/tool/CMakeLists.txt +++ clang-tools-extra/clang-include-fixer/find-all-symbols/tool/CMakeLists.txt @@ -4,7 +4,7 @@ FindAllSymbolsMain.cpp ) -target_link_libraries(find-all-symbols +clang_target_link_libraries(find-all-symbols PRIVATE clangAST clangASTMatchers @@ -13,6 +13,9 @@ clangLex clangSerialization clangTooling + ) +target_link_libraries(find-all-symbols + PRIVATE findAllSymbols ) Index: clang-tools-extra/clang-include-fixer/tool/CMakeLists.txt =================================================================== --- clang-tools-extra/clang-include-fixer/tool/CMakeLists.txt +++ clang-tools-extra/clang-include-fixer/tool/CMakeLists.txt @@ -4,16 +4,19 @@ 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 ) Index: clang-tools-extra/clang-move/tool/CMakeLists.txt =================================================================== --- clang-tools-extra/clang-move/tool/CMakeLists.txt +++ clang-tools-extra/clang-move/tool/CMakeLists.txt @@ -4,16 +4,19 @@ 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 + ) Index: clang-tools-extra/clang-query/tool/CMakeLists.txt =================================================================== --- clang-tools-extra/clang-query/tool/CMakeLists.txt +++ clang-tools-extra/clang-query/tool/CMakeLists.txt @@ -3,14 +3,17 @@ 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 + ) Index: clang-tools-extra/clang-reorder-fields/tool/CMakeLists.txt =================================================================== --- clang-tools-extra/clang-reorder-fields/tool/CMakeLists.txt +++ clang-tools-extra/clang-reorder-fields/tool/CMakeLists.txt @@ -2,13 +2,16 @@ 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 + ) Index: clang-tools-extra/clang-tidy/CMakeLists.txt =================================================================== --- clang-tools-extra/clang-tidy/CMakeLists.txt +++ clang-tools-extra/clang-tidy/CMakeLists.txt @@ -31,7 +31,7 @@ ) if(CLANG_ENABLE_STATIC_ANALYZER) - target_link_libraries(clangTidy PRIVATE + clang_target_link_libraries(clangTidy PRIVATE clangStaticAnalyzerCore clangStaticAnalyzerFrontend ) Index: clang-tools-extra/clang-tidy/tool/CMakeLists.txt =================================================================== --- clang-tools-extra/clang-tidy/tool/CMakeLists.txt +++ clang-tools-extra/clang-tidy/tool/CMakeLists.txt @@ -11,14 +11,17 @@ 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} ) Index: clang-tools-extra/clangd/fuzzer/CMakeLists.txt =================================================================== --- clang-tools-extra/clangd/fuzzer/CMakeLists.txt +++ clang-tools-extra/clangd/fuzzer/CMakeLists.txt @@ -12,13 +12,16 @@ 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 + ) Index: clang-tools-extra/clangd/index/dex/dexp/CMakeLists.txt =================================================================== --- clang-tools-extra/clangd/index/dex/dexp/CMakeLists.txt +++ clang-tools-extra/clangd/index/dex/dexp/CMakeLists.txt @@ -9,8 +9,11 @@ Dexp.cpp ) -target_link_libraries(dexp +clang_target_link_libraries(dexp PRIVATE clangBasic + ) +target_link_libraries(dexp + PRIVATE clangDaemon ) Index: clang-tools-extra/clangd/indexer/CMakeLists.txt =================================================================== --- clang-tools-extra/clangd/indexer/CMakeLists.txt +++ clang-tools-extra/clangd/indexer/CMakeLists.txt @@ -8,13 +8,16 @@ 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 +) Index: clang-tools-extra/clangd/tool/CMakeLists.txt =================================================================== --- clang-tools-extra/clangd/tool/CMakeLists.txt +++ clang-tools-extra/clangd/tool/CMakeLists.txt @@ -15,12 +15,10 @@ 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 @@ -28,5 +26,10 @@ clangToolingCore clangToolingRefactoring clangToolingSyntax + ) +target_link_libraries(clangd + PRIVATE + clangTidy + clangDaemon ${CLANGD_XPC_LIBS} ) Index: clang-tools-extra/clangd/unittests/CMakeLists.txt =================================================================== --- clang-tools-extra/clangd/unittests/CMakeLists.txt +++ clang-tools-extra/clangd/unittests/CMakeLists.txt @@ -78,23 +78,26 @@ $ ) -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 ) Index: clang-tools-extra/clangd/xpc/test-client/CMakeLists.txt =================================================================== --- clang-tools-extra/clangd/xpc/test-client/CMakeLists.txt +++ clang-tools-extra/clangd/xpc/test-client/CMakeLists.txt @@ -13,14 +13,17 @@ 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 ) Index: clang-tools-extra/modularize/CMakeLists.txt =================================================================== --- clang-tools-extra/modularize/CMakeLists.txt +++ clang-tools-extra/modularize/CMakeLists.txt @@ -11,7 +11,7 @@ PreprocessorTracker.cpp ) -target_link_libraries(modularize +clang_target_link_libraries(modularize PRIVATE clangAST clangBasic Index: clang-tools-extra/pp-trace/CMakeLists.txt =================================================================== --- clang-tools-extra/pp-trace/CMakeLists.txt +++ clang-tools-extra/pp-trace/CMakeLists.txt @@ -7,7 +7,7 @@ PPCallbacksTracker.cpp ) -target_link_libraries(pp-trace +clang_target_link_libraries(pp-trace PRIVATE clangAST clangBasic Index: clang-tools-extra/tool-template/CMakeLists.txt =================================================================== --- clang-tools-extra/tool-template/CMakeLists.txt +++ clang-tools-extra/tool-template/CMakeLists.txt @@ -6,7 +6,7 @@ ToolTemplate.cpp ) -target_link_libraries(tool-template +clang_target_link_libraries(tool-template PRIVATE clangAST clangASTMatchers Index: clang-tools-extra/unittests/clang-apply-replacements/CMakeLists.txt =================================================================== --- clang-tools-extra/unittests/clang-apply-replacements/CMakeLists.txt +++ clang-tools-extra/unittests/clang-apply-replacements/CMakeLists.txt @@ -11,10 +11,13 @@ ApplyReplacementsTest.cpp ) -target_link_libraries(ClangApplyReplacementsTests +clang_target_link_libraries(ClangApplyReplacementsTests PRIVATE - clangApplyReplacements clangBasic clangToolingCore clangToolingRefactoring ) +target_link_libraries(ClangApplyReplacementsTests + PRIVATE + clangApplyReplacements + ) Index: clang-tools-extra/unittests/clang-change-namespace/CMakeLists.txt =================================================================== --- clang-tools-extra/unittests/clang-change-namespace/CMakeLists.txt +++ clang-tools-extra/unittests/clang-change-namespace/CMakeLists.txt @@ -15,12 +15,11 @@ ChangeNamespaceTests.cpp ) -target_link_libraries(ClangChangeNamespaceTests +clang_target_link_libraries(ClangChangeNamespaceTests PRIVATE clangAST clangASTMatchers clangBasic - clangChangeNamespace clangFormat clangFrontend clangRewrite @@ -28,3 +27,7 @@ clangTooling clangToolingCore ) +target_link_libraries(ClangChangeNamespaceTests + PRIVATE + clangChangeNamespace + ) Index: clang-tools-extra/unittests/clang-doc/CMakeLists.txt =================================================================== --- clang-tools-extra/unittests/clang-doc/CMakeLists.txt +++ clang-tools-extra/unittests/clang-doc/CMakeLists.txt @@ -20,12 +20,11 @@ YAMLGeneratorTest.cpp ) -target_link_libraries(ClangDocTests +clang_target_link_libraries(ClangDocTests PRIVATE clangAST clangASTMatchers clangBasic - clangDoc clangFormat clangFrontend clangRewrite @@ -33,3 +32,7 @@ clangTooling clangToolingCore ) +target_link_libraries(ClangDocTests + PRIVATE + clangDoc + ) Index: clang-tools-extra/unittests/clang-include-fixer/CMakeLists.txt =================================================================== --- clang-tools-extra/unittests/clang-include-fixer/CMakeLists.txt +++ clang-tools-extra/unittests/clang-include-fixer/CMakeLists.txt @@ -16,16 +16,19 @@ 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 ) Index: clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/CMakeLists.txt =================================================================== --- clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/CMakeLists.txt +++ clang-tools-extra/unittests/clang-include-fixer/find-all-symbols/CMakeLists.txt @@ -12,7 +12,7 @@ FindAllSymbolsTests.cpp ) -target_link_libraries(FindAllSymbolsTests +clang_target_link_libraries(FindAllSymbolsTests PRIVATE clangAST clangASTMatchers @@ -21,5 +21,8 @@ clangLex clangSerialization clangTooling + ) +target_link_libraries(FindAllSymbolsTests + PRIVATE findAllSymbols ) Index: clang-tools-extra/unittests/clang-move/CMakeLists.txt =================================================================== --- clang-tools-extra/unittests/clang-move/CMakeLists.txt +++ clang-tools-extra/unittests/clang-move/CMakeLists.txt @@ -15,16 +15,19 @@ 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 + ) Index: clang-tools-extra/unittests/clang-query/CMakeLists.txt =================================================================== --- clang-tools-extra/unittests/clang-query/CMakeLists.txt +++ clang-tools-extra/unittests/clang-query/CMakeLists.txt @@ -11,14 +11,17 @@ 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 + ) Index: clang-tools-extra/unittests/clang-tidy/CMakeLists.txt =================================================================== --- clang-tools-extra/unittests/clang-tidy/CMakeLists.txt +++ clang-tools-extra/unittests/clang-tidy/CMakeLists.txt @@ -21,7 +21,7 @@ TransformerClangTidyCheckTest.cpp ) -target_link_libraries(ClangTidyTests +clang_target_link_libraries(ClangTidyTests PRIVATE clangAST clangASTMatchers @@ -29,6 +29,12 @@ clangFrontend clangLex clangSerialization + clangTooling + clangToolingCore + clangToolingRefactoring + ) +target_link_libraries(ClangTidyTests + PRIVATE clangTidy clangTidyAndroidModule clangTidyGoogleModule @@ -36,7 +42,4 @@ clangTidyObjCModule clangTidyReadabilityModule clangTidyUtils - clangTooling - clangToolingCore - clangToolingRefactoring )