Author: Michał Górny Date: 2020-06-17T19:00:26+02:00 New Revision: d4f298c8206b435ce627b022efa0d5da620019cd
URL: https://github.com/llvm/llvm-project/commit/d4f298c8206b435ce627b022efa0d5da620019cd DIFF: https://github.com/llvm/llvm-project/commit/d4f298c8206b435ce627b022efa0d5da620019cd.diff LOG: [clang-tools-extra] Prevent linking to duplicate .a libs and dylib Fix various tool libraries not to link to clang's .a libraries and dylib simultaneously. This may cause breakage, in particular through duplicate command-line option declarations. Differential Revision: https://reviews.llvm.org/D81967 Added: Modified: clang-tools-extra/clang-apply-replacements/CMakeLists.txt clang-tools-extra/clang-change-namespace/CMakeLists.txt clang-tools-extra/clang-doc/CMakeLists.txt clang-tools-extra/clang-include-fixer/CMakeLists.txt clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt clang-tools-extra/clang-move/CMakeLists.txt clang-tools-extra/clang-query/CMakeLists.txt clang-tools-extra/clang-reorder-fields/CMakeLists.txt clang-tools-extra/clang-tidy/CMakeLists.txt clang-tools-extra/clang-tidy/abseil/CMakeLists.txt clang-tools-extra/clang-tidy/android/CMakeLists.txt clang-tools-extra/clang-tidy/boost/CMakeLists.txt clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt clang-tools-extra/clang-tidy/cert/CMakeLists.txt clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt clang-tools-extra/clang-tidy/darwin/CMakeLists.txt clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt clang-tools-extra/clang-tidy/google/CMakeLists.txt clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt clang-tools-extra/clang-tidy/llvm/CMakeLists.txt clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt clang-tools-extra/clang-tidy/misc/CMakeLists.txt clang-tools-extra/clang-tidy/modernize/CMakeLists.txt clang-tools-extra/clang-tidy/mpi/CMakeLists.txt clang-tools-extra/clang-tidy/objc/CMakeLists.txt clang-tools-extra/clang-tidy/openmp/CMakeLists.txt clang-tools-extra/clang-tidy/performance/CMakeLists.txt clang-tools-extra/clang-tidy/plugin/CMakeLists.txt clang-tools-extra/clang-tidy/portability/CMakeLists.txt clang-tools-extra/clang-tidy/readability/CMakeLists.txt clang-tools-extra/clang-tidy/tool/CMakeLists.txt clang-tools-extra/clang-tidy/utils/CMakeLists.txt clang-tools-extra/clang-tidy/zircon/CMakeLists.txt clang-tools-extra/clangd/CMakeLists.txt clang-tools-extra/clangd/unittests/CMakeLists.txt Removed: ################################################################################ diff --git a/clang-tools-extra/clang-apply-replacements/CMakeLists.txt b/clang-tools-extra/clang-apply-replacements/CMakeLists.txt index 5bfdcb487e17..27383b488e4d 100644 --- a/clang-tools-extra/clang-apply-replacements/CMakeLists.txt +++ b/clang-tools-extra/clang-apply-replacements/CMakeLists.txt @@ -4,8 +4,10 @@ set(LLVM_LINK_COMPONENTS add_clang_library(clangApplyReplacements lib/Tooling/ApplyReplacements.cpp +) - LINK_LIBS +clang_target_link_libraries(clangApplyReplacements + PRIVATE clangAST clangBasic clangRewrite diff --git a/clang-tools-extra/clang-change-namespace/CMakeLists.txt b/clang-tools-extra/clang-change-namespace/CMakeLists.txt index 7c0363cd00d0..bfce9869dde8 100644 --- a/clang-tools-extra/clang-change-namespace/CMakeLists.txt +++ b/clang-tools-extra/clang-change-namespace/CMakeLists.txt @@ -5,8 +5,10 @@ set(LLVM_LINK_COMPONENTS add_clang_library(clangChangeNamespace ChangeNamespace.cpp +) - LINK_LIBS +clang_target_link_libraries(clangChangeNamespace + PRIVATE clangAST clangASTMatchers clangBasic diff --git a/clang-tools-extra/clang-doc/CMakeLists.txt b/clang-tools-extra/clang-doc/CMakeLists.txt index 8df7d3ef9098..56ec9eb6e94e 100644 --- a/clang-tools-extra/clang-doc/CMakeLists.txt +++ b/clang-tools-extra/clang-doc/CMakeLists.txt @@ -15,8 +15,10 @@ add_clang_library(clangDoc Representation.cpp Serialize.cpp YAMLGenerator.cpp +) - LINK_LIBS +clang_target_link_libraries(clangDoc + PRIVATE clangAnalysis clangAST clangASTMatchers diff --git a/clang-tools-extra/clang-include-fixer/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/CMakeLists.txt index f27f7403ea6a..d8685cb20758 100644 --- a/clang-tools-extra/clang-include-fixer/CMakeLists.txt +++ b/clang-tools-extra/clang-include-fixer/CMakeLists.txt @@ -11,6 +11,11 @@ add_clang_library(clangIncludeFixer YamlSymbolIndex.cpp LINK_LIBS + findAllSymbols + ) + +clang_target_link_libraries(clangIncludeFixer + PRIVATE clangAST clangBasic clangFormat @@ -21,7 +26,6 @@ add_clang_library(clangIncludeFixer clangSerialization clangTooling clangToolingCore - findAllSymbols ) add_subdirectory(plugin) diff --git a/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt b/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt index 20afecd72b18..c0760e8b69c6 100644 --- a/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt +++ b/clang-tools-extra/clang-include-fixer/find-all-symbols/CMakeLists.txt @@ -12,8 +12,10 @@ add_clang_library(findAllSymbols PragmaCommentHandler.cpp STLPostfixHeaderMap.cpp SymbolInfo.cpp + ) - LINK_LIBS +clang_target_link_libraries(findAllSymbols + PRIVATE clangAST clangASTMatchers clangBasic diff --git a/clang-tools-extra/clang-move/CMakeLists.txt b/clang-tools-extra/clang-move/CMakeLists.txt index 4bd8bbb3a0e2..e3bef84baa00 100644 --- a/clang-tools-extra/clang-move/CMakeLists.txt +++ b/clang-tools-extra/clang-move/CMakeLists.txt @@ -6,8 +6,10 @@ set(LLVM_LINK_COMPONENTS add_clang_library(clangMove Move.cpp HelperDeclRefGraph.cpp + ) - LINK_LIBS +clang_target_link_libraries(clangMove + PRIVATE clangAnalysis clangAST clangASTMatchers diff --git a/clang-tools-extra/clang-query/CMakeLists.txt b/clang-tools-extra/clang-query/CMakeLists.txt index 78d73ece2206..8192ec4770eb 100644 --- a/clang-tools-extra/clang-query/CMakeLists.txt +++ b/clang-tools-extra/clang-query/CMakeLists.txt @@ -7,8 +7,10 @@ set(LLVM_LINK_COMPONENTS add_clang_library(clangQuery Query.cpp QueryParser.cpp + ) - LINK_LIBS +clang_target_link_libraries(clangQuery + PRIVATE clangAST clangASTMatchers clangBasic diff --git a/clang-tools-extra/clang-reorder-fields/CMakeLists.txt b/clang-tools-extra/clang-reorder-fields/CMakeLists.txt index c357d0a3cfbf..995efbb2f83a 100644 --- a/clang-tools-extra/clang-reorder-fields/CMakeLists.txt +++ b/clang-tools-extra/clang-reorder-fields/CMakeLists.txt @@ -5,8 +5,10 @@ set(LLVM_LINK_COMPONENTS add_clang_library(clangReorderFields ReorderFieldsAction.cpp +) - LINK_LIBS +clang_target_link_libraries(clangReorderFields + PRIVATE clangAST clangASTMatchers clangBasic diff --git a/clang-tools-extra/clang-tidy/CMakeLists.txt b/clang-tools-extra/clang-tidy/CMakeLists.txt index 1644ca82aa45..f552cb3ad835 100644 --- a/clang-tools-extra/clang-tidy/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/CMakeLists.txt @@ -15,8 +15,10 @@ add_clang_library(clangTidy DEPENDS ClangSACheckers + ) - LINK_LIBS +clang_target_link_libraries(clangTidy + PRIVATE clangAnalysis clangAST clangASTMatchers @@ -32,7 +34,8 @@ add_clang_library(clangTidy ) if(CLANG_ENABLE_STATIC_ANALYZER) - target_link_libraries(clangTidy PRIVATE + clang_target_link_libraries(clangTidy + PRIVATE clangStaticAnalyzerCore clangStaticAnalyzerFrontend ) diff --git a/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt b/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt index 5926717c6c0a..7d8601ad60e4 100644 --- a/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt @@ -26,12 +26,16 @@ add_clang_library(clangTidyAbseilModule UpgradeDurationConversionsCheck.cpp LINK_LIBS + clangTidy + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyAbseilModule + PRIVATE clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyUtils clangTooling clangTransformer ) diff --git a/clang-tools-extra/clang-tidy/android/CMakeLists.txt b/clang-tools-extra/clang-tidy/android/CMakeLists.txt index 0b10702158e4..72ed16061f6c 100644 --- a/clang-tools-extra/clang-tidy/android/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/android/CMakeLists.txt @@ -23,10 +23,14 @@ add_clang_library(clangTidyAndroidModule ComparisonInTempFailureRetryCheck.cpp LINK_LIBS + clangTidy + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyAndroidModule + PRIVATE clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyUtils ) diff --git a/clang-tools-extra/clang-tidy/boost/CMakeLists.txt b/clang-tools-extra/clang-tidy/boost/CMakeLists.txt index 4d2cb6f4b40c..2bddb707dd0e 100644 --- a/clang-tools-extra/clang-tidy/boost/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/boost/CMakeLists.txt @@ -8,10 +8,14 @@ add_clang_library(clangTidyBoostModule UseToStringCheck.cpp LINK_LIBS + clangTidy + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyBoostModule + PRIVATE clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyUtils ) diff --git a/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt b/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt index 4f13847fc28b..e220fd0e67fb 100644 --- a/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt @@ -59,13 +59,17 @@ add_clang_library(clangTidyBugproneModule VirtualNearMissCheck.cpp LINK_LIBS + clangTidy + clangTidyCppCoreGuidelinesModule + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyBugproneModule + PRIVATE clangAnalysis clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyCppCoreGuidelinesModule - clangTidyUtils clangTooling ) diff --git a/clang-tools-extra/clang-tidy/cert/CMakeLists.txt b/clang-tools-extra/clang-tidy/cert/CMakeLists.txt index f6664c95bf06..2aa172718a38 100644 --- a/clang-tools-extra/clang-tidy/cert/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/cert/CMakeLists.txt @@ -21,10 +21,6 @@ add_clang_library(clangTidyCERTModule VariadicFunctionDefCheck.cpp LINK_LIBS - clangAST - clangASTMatchers - clangBasic - clangLex clangTidy clangTidyBugproneModule clangTidyGoogleModule @@ -33,3 +29,11 @@ add_clang_library(clangTidyCERTModule clangTidyReadabilityModule clangTidyUtils ) + +clang_target_link_libraries(clangTidyCERTModule + PRIVATE + clangAST + clangASTMatchers + clangBasic + clangLex + ) diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt b/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt index bfc19fee9ea7..797799da8b08 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt @@ -27,15 +27,19 @@ add_clang_library(clangTidyCppCoreGuidelinesModule SpecialMemberFunctionsCheck.cpp LINK_LIBS - clangAST - clangASTMatchers - clangBasic - clangLex - clangSerialization clangTidy clangTidyMiscModule clangTidyModernizeModule clangTidyReadabilityModule clangTidyUtils + ) + +clang_target_link_libraries(clangTidyCppCoreGuidelinesModule + PRIVATE + clangAST + clangASTMatchers + clangBasic + clangLex + clangSerialization clangTooling ) diff --git a/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt b/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt index 2af86b240ee7..28245b7bce91 100644 --- a/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt @@ -9,11 +9,15 @@ add_clang_library(clangTidyDarwinModule DispatchOnceNonstaticCheck.cpp LINK_LIBS + clangTidy + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyDarwinModule + PRIVATE clangAnalysis clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyUtils ) diff --git a/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt b/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt index c8e39ddf1073..daf092eb4923 100644 --- a/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt @@ -14,11 +14,15 @@ add_clang_library(clangTidyFuchsiaModule VirtualInheritanceCheck.cpp LINK_LIBS + clangTidy + clangTidyGoogleModule + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyFuchsiaModule + PRIVATE clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyGoogleModule - clangTidyUtils ) diff --git a/clang-tools-extra/clang-tidy/google/CMakeLists.txt b/clang-tools-extra/clang-tidy/google/CMakeLists.txt index ab0fbb579bec..68076c1d3bef 100644 --- a/clang-tools-extra/clang-tidy/google/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/google/CMakeLists.txt @@ -24,11 +24,15 @@ add_clang_library(clangTidyGoogleModule UsingNamespaceDirectiveCheck.cpp LINK_LIBS + clangTidy + clangTidyReadabilityModule + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyGoogleModule + PRIVATE clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyReadabilityModule - clangTidyUtils ) diff --git a/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt b/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt index 827e6bd55daf..53edd21fa61b 100644 --- a/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt @@ -11,11 +11,6 @@ add_clang_library(clangTidyHICPPModule SignedBitwiseCheck.cpp LINK_LIBS - clangAST - clangASTMatchers - clangBasic - clangLex - clangSerialization clangTidy clangTidyBugproneModule clangTidyCppCoreGuidelinesModule @@ -26,3 +21,12 @@ add_clang_library(clangTidyHICPPModule clangTidyReadabilityModule clangTidyUtils ) + +clang_target_link_libraries(clangTidyHICPPModule + PRIVATE + clangAST + clangASTMatchers + clangBasic + clangLex + clangSerialization + ) diff --git a/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt b/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt index 39b499b18ef5..5edb652182be 100644 --- a/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt @@ -8,10 +8,14 @@ add_clang_library(clangTidyLinuxKernelModule MustCheckErrsCheck.cpp LINK_LIBS + clangTidy + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyLinuxKernelModule + PRIVATE clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyUtils ) diff --git a/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt b/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt index e68bb69e6d0c..74c92eeaa3a9 100644 --- a/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt @@ -12,12 +12,16 @@ add_clang_library(clangTidyLLVMModule TwineLocalCheck.cpp LINK_LIBS + clangTidy + clangTidyReadabilityModule + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyLLVMModule + PRIVATE clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyReadabilityModule - clangTidyUtils clangTooling ) diff --git a/clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt b/clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt index 9d4edb2abf1a..4a4e654f72c6 100644 --- a/clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt @@ -10,12 +10,16 @@ add_clang_library(clangTidyLLVMLibcModule RestrictSystemLibcHeadersCheck.cpp LINK_LIBS + clangTidy + clangTidyPortabilityModule + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyLLVMLibcModule + PRIVATE clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyPortabilityModule - clangTidyUtils clangTooling ) diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt index 80796fcfbe8b..236a3a8875bd 100644 --- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt @@ -21,13 +21,17 @@ add_clang_library(clangTidyMiscModule UnusedUsingDeclsCheck.cpp LINK_LIBS + clangTidy + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyMiscModule + PRIVATE clangAnalysis clangAST clangASTMatchers clangBasic clangLex clangSerialization - clangTidy - clangTidyUtils clangTooling ) diff --git a/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt b/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt index c74c4051ade7..ee170279c834 100644 --- a/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt @@ -40,12 +40,16 @@ add_clang_library(clangTidyModernizeModule UseUsingCheck.cpp LINK_LIBS + clangTidy + clangTidyReadabilityModule + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyModernizeModule + PRIVATE clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyReadabilityModule - clangTidyUtils clangTooling ) diff --git a/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt b/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt index c4dc6bf7309d..1ac973648eff 100644 --- a/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt @@ -9,13 +9,17 @@ add_clang_library(clangTidyMPIModule TypeMismatchCheck.cpp LINK_LIBS + clangTidy + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyMPIModule + PRIVATE clangAnalysis clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyUtils clangTooling clangStaticAnalyzerCheckers ) diff --git a/clang-tools-extra/clang-tidy/objc/CMakeLists.txt b/clang-tools-extra/clang-tidy/objc/CMakeLists.txt index 5c6c5057174f..297471b54ea1 100644 --- a/clang-tools-extra/clang-tidy/objc/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/objc/CMakeLists.txt @@ -14,10 +14,14 @@ add_clang_library(clangTidyObjCModule SuperSelfCheck.cpp LINK_LIBS + clangTidy + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyObjCModule + PRIVATE clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyUtils ) diff --git a/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt b/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt index 78f1e915b4e1..a23c719456aa 100644 --- a/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt @@ -9,9 +9,13 @@ add_clang_library(clangTidyOpenMPModule UseDefaultNoneCheck.cpp LINK_LIBS + clangTidy + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyOpenMPModule + PRIVATE clangAST clangASTMatchers clangBasic - clangTidy - clangTidyUtils ) diff --git a/clang-tools-extra/clang-tidy/performance/CMakeLists.txt b/clang-tools-extra/clang-tidy/performance/CMakeLists.txt index 83638b46c507..5aa8c24c21ca 100644 --- a/clang-tools-extra/clang-tidy/performance/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/performance/CMakeLists.txt @@ -21,11 +21,15 @@ add_clang_library(clangTidyPerformanceModule UnnecessaryValueParamCheck.cpp LINK_LIBS + clangTidy + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyPerformanceModule + PRIVATE clangAST clangASTMatchers clangAnalysis clangBasic clangLex - clangTidy - clangTidyUtils ) diff --git a/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt b/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt index 4adc3f269770..0bfe122314eb 100644 --- a/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt @@ -2,12 +2,16 @@ add_clang_library(clangTidyPlugin ClangTidyPlugin.cpp LINK_LIBS + clangTidy + ${ALL_CLANG_TIDY_CHECKS} + ) + +clang_target_link_libraries(clangTidyPlugin + PRIVATE clangAST clangASTMatchers clangBasic clangFrontend clangSema - clangTidy clangTooling - ${ALL_CLANG_TIDY_CHECKS} ) diff --git a/clang-tools-extra/clang-tidy/portability/CMakeLists.txt b/clang-tools-extra/clang-tidy/portability/CMakeLists.txt index d3b05d332e94..b4fcf28a9903 100644 --- a/clang-tools-extra/clang-tidy/portability/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/portability/CMakeLists.txt @@ -9,11 +9,15 @@ add_clang_library(clangTidyPortabilityModule SIMDIntrinsicsCheck.cpp LINK_LIBS + clangTidy + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyPortabilityModule + PRIVATE clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyUtils clangTooling ) diff --git a/clang-tools-extra/clang-tidy/readability/CMakeLists.txt b/clang-tools-extra/clang-tidy/readability/CMakeLists.txt index 02003a7537f0..ca2f69b8deb8 100644 --- a/clang-tools-extra/clang-tidy/readability/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/readability/CMakeLists.txt @@ -45,12 +45,16 @@ add_clang_library(clangTidyReadabilityModule UseAnyOfAllOfCheck.cpp LINK_LIBS + clangTidy + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyReadabilityModule + PRIVATE clangAnalysis clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyUtils clangTooling ) diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt index ff9104b661d0..00554e43ad2f 100644 --- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt @@ -13,11 +13,15 @@ add_clang_library(clangTidyMain ClangTidyMain.cpp LINK_LIBS + clangTidy + ${ALL_CLANG_TIDY_CHECKS} + ) + +clang_target_link_libraries(clangTidyMain + PRIVATE clangAST clangASTMatchers clangBasic - clangTidy - ${ALL_CLANG_TIDY_CHECKS} clangTooling clangToolingCore ) diff --git a/clang-tools-extra/clang-tidy/utils/CMakeLists.txt b/clang-tools-extra/clang-tidy/utils/CMakeLists.txt index 2f5ecc42f824..26032f21c701 100644 --- a/clang-tools-extra/clang-tidy/utils/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/utils/CMakeLists.txt @@ -22,11 +22,15 @@ add_clang_library(clangTidyUtils UsingInserter.cpp LINK_LIBS + clangTidy + ) + +clang_target_link_libraries(clangTidyUtils + PRIVATE clangAST clangASTMatchers clangBasic clangLex clangSema - clangTidy clangTransformer ) diff --git a/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt b/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt index 04db242f20a0..29c99e92e097 100644 --- a/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt @@ -8,10 +8,14 @@ add_clang_library(clangTidyZirconModule ZirconTidyModule.cpp LINK_LIBS + clangTidy + clangTidyUtils + ) + +clang_target_link_libraries(clangTidyZirconModule + PRIVATE clangAST clangASTMatchers clangBasic clangLex - clangTidy - clangTidyUtils ) diff --git a/clang-tools-extra/clangd/CMakeLists.txt b/clang-tools-extra/clangd/CMakeLists.txt index dd3e02713559..fa4f8b41ff8d 100644 --- a/clang-tools-extra/clangd/CMakeLists.txt +++ b/clang-tools-extra/clangd/CMakeLists.txt @@ -96,6 +96,14 @@ add_clang_library(clangDaemon refactor/Tweak.cpp LINK_LIBS + clangdSupport + clangTidy + ${LLVM_PTHREAD_LIB} + ${ALL_CLANG_TIDY_CHECKS} + ) + +clang_target_link_libraries(clangDaemon + PRIVATE clangAST clangASTMatchers clangBasic @@ -106,15 +114,11 @@ add_clang_library(clangDaemon clangLex clangSema clangSerialization - clangTidy clangTooling clangToolingCore clangToolingInclusions clangToolingRefactoring clangToolingSyntax - clangdSupport - ${LLVM_PTHREAD_LIB} - ${ALL_CLANG_TIDY_CHECKS} ) add_subdirectory(refactor/tweaks) diff --git a/clang-tools-extra/clangd/unittests/CMakeLists.txt b/clang-tools-extra/clangd/unittests/CMakeLists.txt index b907dfe2c6f3..03e09669b13f 100644 --- a/clang-tools-extra/clangd/unittests/CMakeLists.txt +++ b/clang-tools-extra/clangd/unittests/CMakeLists.txt @@ -120,7 +120,6 @@ target_link_libraries(ClangdTests clangDaemon clangdSupport clangTidy - LLVMSupport LLVMTestingSupport ) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits