[clang-tools-extra] [clang-tidy] Refactor the build system (PR #173518)

Victor Chernyakin via cfe-commits Thu, 25 Dec 2025 21:10:20 -0800

https://github.com/localspook updated 
https://github.com/llvm/llvm-project/pull/173518


>From 0e448a11221a1804465983bbdce1a233e40ed22c Mon Sep 17 00:00:00 2001
From: Victor Chernyakin <[email protected]>
Date: Wed, 24 Dec 2025 20:22:44 -0700
Subject: [PATCH 1/2] [clang-tidy] Refactor the build system

---
 clang-tools-extra/clang-tidy/CMakeLists.txt   | 579 +++++++++++++++---
 .../clang-tidy/abseil/CMakeLists.txt          |  49 --
 .../clang-tidy/altera/CMakeLists.txt          |  29 -
 .../clang-tidy/android/CMakeLists.txt         |  40 --
 .../clang-tidy/boost/CMakeLists.txt           |  26 -
 .../clang-tidy/bugprone/CMakeLists.txt        | 138 -----
 .../clang-tidy/cert/CMakeLists.txt            |  31 -
 .../clang-tidy/concurrency/CMakeLists.txt     |  28 -
 .../cppcoreguidelines/CMakeLists.txt          |  63 --
 .../clang-tidy/custom/CMakeLists.txt          |  38 --
 .../clang-tidy/darwin/CMakeLists.txt          |  27 -
 .../clang-tidy/fuchsia/CMakeLists.txt         |  33 -
 .../clang-tidy/google/CMakeLists.txt          |  42 --
 .../clang-tidy/hicpp/CMakeLists.txt           |  37 --
 .../clang-tidy/linuxkernel/CMakeLists.txt     |  25 -
 .../clang-tidy/llvm/CMakeLists.txt            |  35 --
 .../clang-tidy/llvmlibc/CMakeLists.txt        |  30 -
 .../clang-tidy/misc/CMakeLists.txt            |  64 --
 .../clang-tidy/modernize/CMakeLists.txt       |  75 ---
 .../clang-tidy/mpi/CMakeLists.txt             |  29 -
 .../clang-tidy/objc/CMakeLists.txt            |  33 -
 .../clang-tidy/openmp/CMakeLists.txt          |  24 -
 .../clang-tidy/performance/CMakeLists.txt     |  45 --
 .../clang-tidy/plugin/CMakeLists.txt          |  21 -
 .../clang-tidy/portability/CMakeLists.txt     |  31 -
 .../clang-tidy/readability/CMakeLists.txt     |  83 ---
 .../clang-tidy/tool/CMakeLists.txt            |   2 -
 .../clang-tidy/utils/CMakeLists.txt           |  48 --
 .../clang-tidy/zircon/CMakeLists.txt          |  25 -
 clang-tools-extra/clangd/CMakeLists.txt       |   7 +-
 clang-tools-extra/clangd/tool/CMakeLists.txt  |   1 -
 .../clangd/unittests/CMakeLists.txt           |   1 -
 .../unittests/clang-tidy/CMakeLists.txt       |  15 -
 33 files changed, 511 insertions(+), 1243 deletions(-)
 delete mode 100644 clang-tools-extra/clang-tidy/abseil/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/altera/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/android/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/boost/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/cert/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/concurrency/CMakeLists.txt
 delete mode 100644 
clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/custom/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/darwin/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/google/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/llvm/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/mpi/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/objc/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/openmp/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/performance/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/plugin/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/portability/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/readability/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/utils/CMakeLists.txt
 delete mode 100644 clang-tools-extra/clang-tidy/zircon/CMakeLists.txt

diff --git a/clang-tools-extra/clang-tidy/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/CMakeLists.txt
index 153356245cfd1..ccd005b2a692e 100644
--- a/clang-tools-extra/clang-tidy/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/CMakeLists.txt
@@ -1,13 +1,19 @@
 set(LLVM_LINK_COMPONENTS
   FrontendOpenMP
   Support
+  TargetParser
   )
 
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/clang-tidy-config.h.cmake
   ${CMAKE_CURRENT_BINARY_DIR}/clang-tidy-config.h)
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/misc)
+include_directories(BEFORE 
"${CMAKE_CURRENT_SOURCE_DIR}/../include-cleaner/include")
 
+add_subdirectory(misc)
+
+# If you add a check module, also add it to ClangTidyForceLinker.h in this 
directory.
 add_clang_library(clangTidy STATIC
   ClangTidy.cpp
   ClangTidyCheck.cpp
@@ -19,10 +25,495 @@ add_clang_library(clangTidy STATIC
   GlobList.cpp
   NoLintDirectiveHandler.cpp
 
+  abseil/AbseilTidyModule.cpp
+  abseil/CleanupCtadCheck.cpp
+  abseil/DurationAdditionCheck.cpp
+  abseil/DurationComparisonCheck.cpp
+  abseil/DurationConversionCastCheck.cpp
+  abseil/DurationDivisionCheck.cpp
+  abseil/DurationFactoryFloatCheck.cpp
+  abseil/DurationFactoryScaleCheck.cpp
+  abseil/DurationRewriter.cpp
+  abseil/DurationSubtractionCheck.cpp
+  abseil/DurationUnnecessaryConversionCheck.cpp
+  abseil/FasterStrsplitDelimiterCheck.cpp
+  abseil/NoInternalDependenciesCheck.cpp
+  abseil/NoNamespaceCheck.cpp
+  abseil/RedundantStrcatCallsCheck.cpp
+  abseil/StrCatAppendCheck.cpp
+  abseil/StringFindStartswithCheck.cpp
+  abseil/StringFindStrContainsCheck.cpp
+  abseil/TimeComparisonCheck.cpp
+  abseil/TimeSubtractionCheck.cpp
+  abseil/UpgradeDurationConversionsCheck.cpp
+  abseil/UncheckedStatusOrAccessCheck.cpp
+
+  altera/AlteraTidyModule.cpp
+  altera/IdDependentBackwardBranchCheck.cpp
+  altera/KernelNameRestrictionCheck.cpp
+  altera/SingleWorkItemBarrierCheck.cpp
+  altera/StructPackAlignCheck.cpp
+  altera/UnrollLoopsCheck.cpp
+
+  android/AndroidTidyModule.cpp
+  android/CloexecAccept4Check.cpp
+  android/CloexecAcceptCheck.cpp
+  android/CloexecCheck.cpp
+  android/CloexecCreatCheck.cpp
+  android/CloexecDupCheck.cpp
+  android/CloexecEpollCreate1Check.cpp
+  android/CloexecEpollCreateCheck.cpp
+  android/CloexecFopenCheck.cpp
+  android/CloexecInotifyInit1Check.cpp
+  android/CloexecInotifyInitCheck.cpp
+  android/CloexecMemfdCreateCheck.cpp
+  android/CloexecOpenCheck.cpp
+  android/CloexecPipeCheck.cpp
+  android/CloexecPipe2Check.cpp
+  android/CloexecSocketCheck.cpp
+  android/ComparisonInTempFailureRetryCheck.cpp
+
+  boost/BoostTidyModule.cpp
+  boost/UseRangesCheck.cpp
+  boost/UseToStringCheck.cpp
+
+  bugprone/ArgumentCommentCheck.cpp
+  bugprone/AssertSideEffectCheck.cpp
+  bugprone/AssignmentInIfConditionCheck.cpp
+  bugprone/BadSignalToKillThreadCheck.cpp
+  bugprone/BitwisePointerCastCheck.cpp
+  bugprone/BoolPointerImplicitConversionCheck.cpp
+  bugprone/BranchCloneCheck.cpp
+  bugprone/BugproneTidyModule.cpp
+  bugprone/CapturingThisInMemberVariableCheck.cpp
+  bugprone/CastingThroughVoidCheck.cpp
+  bugprone/ChainedComparisonCheck.cpp
+  bugprone/CommandProcessorCheck.cpp
+  bugprone/ComparePointerToMemberVirtualFunctionCheck.cpp
+  bugprone/CopyConstructorInitCheck.cpp
+  bugprone/CopyConstructorMutatesArgumentCheck.cpp
+  bugprone/CrtpConstructorAccessibilityCheck.cpp
+  bugprone/DanglingHandleCheck.cpp
+  bugprone/DefaultOperatorNewOnOveralignedTypeCheck.cpp
+  bugprone/DerivedMethodShadowingBaseMethodCheck.cpp
+  bugprone/DynamicStaticInitializersCheck.cpp
+  bugprone/EasilySwappableParametersCheck.cpp
+  bugprone/EmptyCatchCheck.cpp
+  bugprone/ExceptionCopyConstructorThrowsCheck.cpp
+  bugprone/ExceptionEscapeCheck.cpp
+  bugprone/FloatLoopCounterCheck.cpp
+  bugprone/FoldInitTypeCheck.cpp
+  bugprone/ForwardDeclarationNamespaceCheck.cpp
+  bugprone/ForwardingReferenceOverloadCheck.cpp
+  bugprone/ImplicitWideningOfMultiplicationResultCheck.cpp
+  bugprone/InaccurateEraseCheck.cpp
+  bugprone/IncorrectEnableIfCheck.cpp
+  bugprone/IncorrectEnableSharedFromThisCheck.cpp
+  bugprone/InvalidEnumDefaultInitializationCheck.cpp
+  bugprone/UnintendedCharOstreamOutputCheck.cpp
+  bugprone/ReturnConstRefFromParameterCheck.cpp
+  bugprone/SuspiciousStringviewDataUsageCheck.cpp
+  bugprone/SwitchMissingDefaultCaseCheck.cpp
+  bugprone/IncDecInConditionsCheck.cpp
+  bugprone/IncorrectEnableIfCheck.cpp
+  bugprone/IncorrectRoundingsCheck.cpp
+  bugprone/InfiniteLoopCheck.cpp
+  bugprone/IntegerDivisionCheck.cpp
+  bugprone/LambdaFunctionNameCheck.cpp
+  bugprone/MacroParenthesesCheck.cpp
+  bugprone/MacroRepeatedSideEffectsCheck.cpp
+  bugprone/MisleadingSetterOfReferenceCheck.cpp
+  bugprone/MisplacedOperatorInStrlenInAllocCheck.cpp
+  bugprone/MisplacedPointerArithmeticInAllocCheck.cpp
+  bugprone/MisplacedWideningCastCheck.cpp
+  bugprone/MoveForwardingReferenceCheck.cpp
+  bugprone/MultiLevelImplicitPointerConversionCheck.cpp
+  bugprone/MultipleNewInOneExpressionCheck.cpp
+  bugprone/MultipleStatementMacroCheck.cpp
+  bugprone/NarrowingConversionsCheck.cpp
+  bugprone/NoEscapeCheck.cpp
+  bugprone/NonZeroEnumToBoolConversionCheck.cpp
+  bugprone/NondeterministicPointerIterationOrderCheck.cpp
+  bugprone/NotNullTerminatedResultCheck.cpp
+  bugprone/OptionalValueConversionCheck.cpp
+  bugprone/ParentVirtualCallCheck.cpp
+  bugprone/PointerArithmeticOnPolymorphicObjectCheck.cpp
+  bugprone/PosixReturnCheck.cpp
+  bugprone/RandomGeneratorSeedCheck.cpp
+  bugprone/RawMemoryCallOnNonTrivialTypeCheck.cpp
+  bugprone/RedundantBranchConditionCheck.cpp
+  bugprone/ReservedIdentifierCheck.cpp
+  bugprone/ReturnConstRefFromParameterCheck.cpp
+  bugprone/SharedPtrArrayMismatchCheck.cpp
+  bugprone/SignalHandlerCheck.cpp
+  bugprone/SignedCharMisuseCheck.cpp
+  bugprone/SizeofContainerCheck.cpp
+  bugprone/SizeofExpressionCheck.cpp
+  bugprone/SmartPtrArrayMismatchCheck.cpp
+  bugprone/SpuriouslyWakeUpFunctionsCheck.cpp
+  bugprone/StandaloneEmptyCheck.cpp
+  bugprone/StdNamespaceModificationCheck.cpp
+  bugprone/StringConstructorCheck.cpp
+  bugprone/StringIntegerAssignmentCheck.cpp
+  bugprone/StringLiteralWithEmbeddedNulCheck.cpp
+  bugprone/StringviewNullptrCheck.cpp
+  bugprone/SuspiciousEnumUsageCheck.cpp
+  bugprone/SuspiciousIncludeCheck.cpp
+  bugprone/SuspiciousMemoryComparisonCheck.cpp
+  bugprone/SuspiciousMemsetUsageCheck.cpp
+  bugprone/SuspiciousMissingCommaCheck.cpp
+  bugprone/SuspiciousReallocUsageCheck.cpp
+  bugprone/SuspiciousSemicolonCheck.cpp
+  bugprone/SuspiciousStringCompareCheck.cpp
+  bugprone/SuspiciousStringviewDataUsageCheck.cpp
+  bugprone/SwappedArgumentsCheck.cpp
+  bugprone/SwitchMissingDefaultCaseCheck.cpp
+  bugprone/TaggedUnionMemberCountCheck.cpp
+  bugprone/TerminatingContinueCheck.cpp
+  bugprone/ThrowKeywordMissingCheck.cpp
+  bugprone/ThrowingStaticInitializationCheck.cpp
+  bugprone/TooSmallLoopVariableCheck.cpp
+  bugprone/UncheckedOptionalAccessCheck.cpp
+  bugprone/UncheckedStringToNumberConversionCheck.cpp
+  bugprone/UndefinedMemoryManipulationCheck.cpp
+  bugprone/UndelegatedConstructorCheck.cpp
+  bugprone/UnhandledExceptionAtNewCheck.cpp
+  bugprone/UnhandledSelfAssignmentCheck.cpp
+  bugprone/UniquePtrArrayMismatchCheck.cpp
+  bugprone/UnsafeFunctionsCheck.cpp
+  bugprone/UnusedLocalNonTrivialVariableCheck.cpp
+  bugprone/UnusedRaiiCheck.cpp
+  bugprone/UnusedReturnValueCheck.cpp
+  bugprone/UseAfterMoveCheck.cpp
+  bugprone/VirtualNearMissCheck.cpp
+
+  cert/CERTTidyModule.cpp
+
+  concurrency/ConcurrencyTidyModule.cpp
+  concurrency/MtUnsafeCheck.cpp
+  concurrency/ThreadCanceltypeAsynchronousCheck.cpp
+
+  cppcoreguidelines/AvoidCapturingLambdaCoroutinesCheck.cpp
+  cppcoreguidelines/AvoidConstOrRefDataMembersCheck.cpp
+  cppcoreguidelines/AvoidDoWhileCheck.cpp
+  cppcoreguidelines/AvoidGotoCheck.cpp
+  cppcoreguidelines/AvoidNonConstGlobalVariablesCheck.cpp
+  cppcoreguidelines/AvoidReferenceCoroutineParametersCheck.cpp
+  cppcoreguidelines/CppCoreGuidelinesTidyModule.cpp
+  cppcoreguidelines/InitVariablesCheck.cpp
+  cppcoreguidelines/InterfacesGlobalInitCheck.cpp
+  cppcoreguidelines/MacroUsageCheck.cpp
+  cppcoreguidelines/MisleadingCaptureDefaultByValueCheck.cpp
+  cppcoreguidelines/MissingStdForwardCheck.cpp
+  cppcoreguidelines/NoMallocCheck.cpp
+  cppcoreguidelines/NoSuspendWithLockCheck.cpp
+  cppcoreguidelines/OwningMemoryCheck.cpp
+  cppcoreguidelines/PreferMemberInitializerCheck.cpp
+  cppcoreguidelines/ProBoundsArrayToPointerDecayCheck.cpp
+  cppcoreguidelines/ProBoundsAvoidUncheckedContainerAccessCheck.cpp
+  cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp
+  cppcoreguidelines/ProBoundsPointerArithmeticCheck.cpp
+  cppcoreguidelines/ProTypeConstCastCheck.cpp
+  cppcoreguidelines/ProTypeCstyleCastCheck.cpp
+  cppcoreguidelines/ProTypeMemberInitCheck.cpp
+  cppcoreguidelines/ProTypeReinterpretCastCheck.cpp
+  cppcoreguidelines/ProTypeStaticCastDowncastCheck.cpp
+  cppcoreguidelines/ProTypeUnionAccessCheck.cpp
+  cppcoreguidelines/ProTypeVarargCheck.cpp
+  cppcoreguidelines/RvalueReferenceParamNotMovedCheck.cpp
+  cppcoreguidelines/SlicingCheck.cpp
+  cppcoreguidelines/SpecialMemberFunctionsCheck.cpp
+  cppcoreguidelines/UseEnumClassCheck.cpp
+  cppcoreguidelines/VirtualClassDestructorCheck.cpp
+
+  $<$<BOOL:${CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS}>:
+    custom/CustomTidyModule.cpp
+    custom/QueryCheck.cpp
+  >
+
+  darwin/AvoidSpinlockCheck.cpp
+  darwin/DarwinTidyModule.cpp
+  darwin/DispatchOnceNonstaticCheck.cpp
+
+  fuchsia/DefaultArgumentsCallsCheck.cpp
+  fuchsia/DefaultArgumentsDeclarationsCheck.cpp
+  fuchsia/FuchsiaTidyModule.cpp
+  fuchsia/OverloadedOperatorCheck.cpp
+  fuchsia/StaticallyConstructedObjectsCheck.cpp
+  fuchsia/TemporaryObjectsCheck.cpp
+  fuchsia/TrailingReturnCheck.cpp
+  fuchsia/VirtualInheritanceCheck.cpp
+
+  google/AvoidNSObjectNewCheck.cpp
+  google/AvoidThrowingObjCExceptionCheck.cpp
+  google/AvoidUnderscoreInGoogletestNameCheck.cpp
+  google/DefaultArgumentsCheck.cpp
+  google/ExplicitConstructorCheck.cpp
+  google/ExplicitMakePairCheck.cpp
+  google/FloatTypesCheck.cpp
+  google/FunctionNamingCheck.cpp
+  google/GlobalNamesInHeadersCheck.cpp
+  google/GlobalVariableDeclarationCheck.cpp
+  google/GoogleTidyModule.cpp
+  google/IntegerTypesCheck.cpp
+  google/OverloadedUnaryAndCheck.cpp
+  google/TodoCommentCheck.cpp
+  google/UnnamedNamespaceInHeaderCheck.cpp
+  google/UpgradeGoogletestCaseCheck.cpp
+  google/UsingNamespaceDirectiveCheck.cpp
+
+  hicpp/ExceptionBaseclassCheck.cpp
+  hicpp/HICPPTidyModule.cpp
+  hicpp/IgnoredRemoveResultCheck.cpp
+  hicpp/MultiwayPathsCoveredCheck.cpp
+  hicpp/NoAssemblerCheck.cpp
+  hicpp/SignedBitwiseCheck.cpp
+
+  linuxkernel/LinuxKernelTidyModule.cpp
+  linuxkernel/MustCheckErrsCheck.cpp
+
+  llvm/HeaderGuardCheck.cpp
+  llvm/IncludeOrderCheck.cpp
+  llvm/LLVMTidyModule.cpp
+  llvm/PreferIsaOrDynCastInConditionalsCheck.cpp
+  llvm/PreferRegisterOverUnsignedCheck.cpp
+  llvm/PreferStaticOverAnonymousNamespaceCheck.cpp
+  llvm/TwineLocalCheck.cpp
+  llvm/UseNewMLIROpBuilderCheck.cpp
+  llvm/UseRangesCheck.cpp
+
+  llvmlibc/CalleeNamespaceCheck.cpp
+  llvmlibc/ImplementationInNamespaceCheck.cpp
+  llvmlibc/InlineFunctionDeclCheck.cpp
+  llvmlibc/LLVMLibcTidyModule.cpp
+  llvmlibc/RestrictSystemLibcHeadersCheck.cpp
+
+  misc/ConstCorrectnessCheck.cpp
+  misc/CoroutineHostileRAIICheck.cpp
+  misc/DefinitionsInHeadersCheck.cpp
+  misc/ConfusableIdentifierCheck.cpp
+  misc/HeaderIncludeCycleCheck.cpp
+  misc/IncludeCleanerCheck.cpp
+  misc/MiscTidyModule.cpp
+  misc/MisleadingBidirectionalCheck.cpp
+  misc/MisleadingIdentifierCheck.cpp
+  misc/MisplacedConstCheck.cpp
+  misc/MultipleInheritanceCheck.cpp
+  misc/NewDeleteOverloadsCheck.cpp
+  misc/NoRecursionCheck.cpp
+  misc/NonCopyableObjectsCheck.cpp
+  misc/NonPrivateMemberVariablesInClassesCheck.cpp
+  misc/OverrideWithDifferentVisibilityCheck.cpp
+  misc/PredictableRandCheck.cpp
+  misc/RedundantExpressionCheck.cpp
+  misc/StaticAssertCheck.cpp
+  misc/ThrowByValueCatchByReferenceCheck.cpp
+  misc/UnconventionalAssignOperatorCheck.cpp
+  misc/UniqueptrResetReleaseCheck.cpp
+  misc/UnusedAliasDeclsCheck.cpp
+  misc/UnusedParametersCheck.cpp
+  misc/UnusedUsingDeclsCheck.cpp
+  misc/UseAnonymousNamespaceCheck.cpp
+  misc/UseInternalLinkageCheck.cpp
+
+  modernize/AvoidBindCheck.cpp
+  modernize/AvoidCArraysCheck.cpp
+  modernize/AvoidCStyleCastCheck.cpp
+  modernize/AvoidSetjmpLongjmpCheck.cpp
+  modernize/AvoidVariadicFunctionsCheck.cpp
+  modernize/ConcatNestedNamespacesCheck.cpp
+  modernize/DeprecatedHeadersCheck.cpp
+  modernize/DeprecatedIosBaseAliasesCheck.cpp
+  modernize/IntegralLiteralExpressionMatcher.cpp
+  modernize/LoopConvertCheck.cpp
+  modernize/LoopConvertUtils.cpp
+  modernize/MacroToEnumCheck.cpp
+  modernize/MakeSharedCheck.cpp
+  modernize/MakeSmartPtrCheck.cpp
+  modernize/MakeUniqueCheck.cpp
+  modernize/MinMaxUseInitializerListCheck.cpp
+  modernize/ModernizeTidyModule.cpp
+  modernize/PassByValueCheck.cpp
+  modernize/RawStringLiteralCheck.cpp
+  modernize/RedundantVoidArgCheck.cpp
+  modernize/ReplaceAutoPtrCheck.cpp
+  modernize/ReplaceDisallowCopyAndAssignMacroCheck.cpp
+  modernize/ReplaceRandomShuffleCheck.cpp
+  modernize/ReturnBracedInitListCheck.cpp
+  modernize/ShrinkToFitCheck.cpp
+  modernize/TypeTraitsCheck.cpp
+  modernize/UnaryStaticAssertCheck.cpp
+  modernize/UseAutoCheck.cpp
+  modernize/UseBoolLiteralsCheck.cpp
+  modernize/UseConstraintsCheck.cpp
+  modernize/UseDefaultMemberInitCheck.cpp
+  modernize/UseDesignatedInitializersCheck.cpp
+  modernize/UseEmplaceCheck.cpp
+  modernize/UseEqualsDefaultCheck.cpp
+  modernize/UseEqualsDeleteCheck.cpp
+  modernize/UseIntegerSignComparisonCheck.cpp
+  modernize/UseNodiscardCheck.cpp
+  modernize/UseNoexceptCheck.cpp
+  modernize/UseNullptrCheck.cpp
+  modernize/UseOverrideCheck.cpp
+  modernize/UseRangesCheck.cpp
+  modernize/UseScopedLockCheck.cpp
+  modernize/UseStartsEndsWithCheck.cpp
+  modernize/UseStdFormatCheck.cpp
+  modernize/UseStdNumbersCheck.cpp
+  modernize/UseStdPrintCheck.cpp
+  modernize/UseTrailingReturnTypeCheck.cpp
+  modernize/UseTransparentFunctorsCheck.cpp
+  modernize/UseUncaughtExceptionsCheck.cpp
+  modernize/UseUsingCheck.cpp
+
+  $<$<BOOL:${CLANG_TIDY_ENABLE_STATIC_ANALYZER}>:
+    mpi/BufferDerefCheck.cpp
+    mpi/MPITidyModule.cpp
+    mpi/TypeMismatchCheck.cpp
+  >
+
+  objc/AssertEqualsCheck.cpp
+  objc/AvoidNSErrorInitCheck.cpp
+  objc/DeallocInCategoryCheck.cpp
+  objc/ForbiddenSubclassingCheck.cpp
+  objc/MissingHashCheck.cpp
+  objc/NSInvocationArgumentLifetimeCheck.cpp
+  objc/NSDateFormatterCheck.cpp
+  objc/ObjCTidyModule.cpp
+  objc/PropertyDeclarationCheck.cpp
+  objc/SuperSelfCheck.cpp
+
+  openmp/ExceptionEscapeCheck.cpp
+  openmp/OpenMPTidyModule.cpp
+  openmp/UseDefaultNoneCheck.cpp
+
+  performance/AvoidEndlCheck.cpp
+  performance/EnumSizeCheck.cpp
+  performance/FasterStringFindCheck.cpp
+  performance/ForRangeCopyCheck.cpp
+  performance/ImplicitConversionInLoopCheck.cpp
+  performance/InefficientAlgorithmCheck.cpp
+  performance/InefficientStringConcatenationCheck.cpp
+  performance/InefficientVectorOperationCheck.cpp
+  performance/MoveConstArgCheck.cpp
+  performance/MoveConstructorInitCheck.cpp
+  performance/NoAutomaticMoveCheck.cpp
+  performance/NoIntToPtrCheck.cpp
+  performance/NoexceptDestructorCheck.cpp
+  performance/NoexceptFunctionBaseCheck.cpp
+  performance/NoexceptMoveConstructorCheck.cpp
+  performance/NoexceptSwapCheck.cpp
+  performance/PerformanceTidyModule.cpp
+  performance/TriviallyDestructibleCheck.cpp
+  performance/TypePromotionInMathFnCheck.cpp
+  performance/UnnecessaryCopyInitializationCheck.cpp
+  performance/UnnecessaryValueParamCheck.cpp
+
+  plugin/ClangTidyPlugin.cpp
+
+  portability/AvoidPragmaOnceCheck.cpp
+  portability/PortabilityTidyModule.cpp
+  portability/RestrictSystemIncludesCheck.cpp
+  portability/SIMDIntrinsicsCheck.cpp
+  portability/StdAllocatorConstCheck.cpp
+  portability/TemplateVirtualMemberFunctionCheck.cpp
+
+  readability/AmbiguousSmartptrResetCallCheck.cpp
+  readability/AvoidConstParamsInDeclsCheck.cpp
+  readability/AvoidNestedConditionalOperatorCheck.cpp
+  readability/AvoidReturnWithVoidValueCheck.cpp
+  readability/AvoidUnconditionalPreprocessorIfCheck.cpp
+  readability/BracesAroundStatementsCheck.cpp
+  readability/ConstReturnTypeCheck.cpp
+  readability/ContainerContainsCheck.cpp
+  readability/ContainerDataPointerCheck.cpp
+  readability/ContainerSizeEmptyCheck.cpp
+  readability/ConvertMemberFunctionsToStaticCheck.cpp
+  readability/DeleteNullPointerCheck.cpp
+  readability/DuplicateIncludeCheck.cpp
+  readability/ElseAfterReturnCheck.cpp
+  readability/EnumInitialValueCheck.cpp
+  readability/FunctionCognitiveComplexityCheck.cpp
+  readability/FunctionSizeCheck.cpp
+  readability/IdentifierLengthCheck.cpp
+  readability/IdentifierNamingCheck.cpp
+  readability/ImplicitBoolConversionCheck.cpp
+  readability/RedundantInlineSpecifierCheck.cpp
+  readability/InconsistentDeclarationParameterNameCheck.cpp
+  readability/IsolateDeclarationCheck.cpp
+  readability/MagicNumbersCheck.cpp
+  readability/MakeMemberFunctionConstCheck.cpp
+  readability/MathMissingParenthesesCheck.cpp
+  readability/MisleadingIndentationCheck.cpp
+  readability/MisplacedArrayIndexCheck.cpp
+  readability/NamedParameterCheck.cpp
+  readability/NamespaceCommentCheck.cpp
+  readability/NonConstParameterCheck.cpp
+  readability/OperatorsRepresentationCheck.cpp
+  readability/QualifiedAutoCheck.cpp
+  readability/ReadabilityTidyModule.cpp
+  readability/RedundantAccessSpecifiersCheck.cpp
+  readability/RedundantCastingCheck.cpp
+  readability/RedundantControlFlowCheck.cpp
+  readability/RedundantDeclarationCheck.cpp
+  readability/RedundantFunctionPtrDereferenceCheck.cpp
+  readability/RedundantMemberInitCheck.cpp
+  readability/RedundantParenthesesCheck.cpp
+  readability/RedundantPreprocessorCheck.cpp
+  readability/RedundantSmartptrGetCheck.cpp
+  readability/RedundantStringCStrCheck.cpp
+  readability/RedundantStringInitCheck.cpp
+  readability/RedundantTypenameCheck.cpp
+  readability/ReferenceToConstructedTemporaryCheck.cpp
+  readability/SimplifyBooleanExprCheck.cpp
+  readability/SimplifySubscriptExprCheck.cpp
+  readability/StaticAccessedThroughInstanceCheck.cpp
+  readability/StaticDefinitionInAnonymousNamespaceCheck.cpp
+  readability/StringCompareCheck.cpp
+  readability/SuspiciousCallArgumentCheck.cpp
+  readability/UniqueptrDeleteReleaseCheck.cpp
+  readability/UppercaseLiteralSuffixCheck.cpp
+  readability/UseAnyOfAllOfCheck.cpp
+  readability/UseConcisePreprocessorDirectivesCheck.cpp
+  readability/UseStdMinMaxCheck.cpp
+
+  utils/Aliasing.cpp
+  utils/ASTUtils.cpp
+  utils/BracesAroundStatement.cpp
+  utils/DeclRefExprUtils.cpp
+  utils/DesignatedInitializers.cpp
+  utils/ExceptionAnalyzer.cpp
+  utils/ExceptionSpecAnalyzer.cpp
+  utils/ExprSequence.cpp
+  utils/FileExtensionsUtils.cpp
+  utils/FormatStringConverter.cpp
+  utils/FixItHintUtils.cpp
+  utils/HeaderGuard.cpp
+  utils/IncludeInserter.cpp
+  utils/IncludeSorter.cpp
+  utils/LexerUtils.cpp
+  utils/Matchers.cpp
+  utils/NamespaceAliaser.cpp
+  utils/OptionsUtils.cpp
+  utils/RenamerClangTidyCheck.cpp
+  utils/TransformerClangTidyCheck.cpp
+  utils/TypeTraits.cpp
+  utils/UseRangesCheck.cpp
+  utils/UsingInserter.cpp
+
+  zircon/ZirconTidyModule.cpp
+
+  LINK_LIBS
+  $<$<BOOL:${CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS}>:
+    clangQuery
+  >
+
   DEPENDS
-  ClangSACheckers
+  genconfusable
   omp_gen
   ClangDriverOptions
+  ClangSACheckers
   )
 
 clang_target_link_libraries(clangTidy
@@ -30,92 +521,38 @@ clang_target_link_libraries(clangTidy
   clangAST
   clangASTMatchers
   clangAnalysis
+  clangAnalysisFlowSensitive
+  clangAnalysisFlowSensitiveModels
   clangBasic
   clangFormat
   clangFrontend
   clangLex
   clangRewrite
+  clangSema
   clangSerialization
   clangTooling
   clangToolingCore
-  )
+  clangToolingInclusions
+  clangToolingInclusionsStdlib
+  clangTransformer
+
+  $<$<BOOL:${CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS}>:
+    clangDynamicASTMatchers
+  >
 
-if(CLANG_TIDY_ENABLE_STATIC_ANALYZER)
-  clang_target_link_libraries(clangTidy
-    PRIVATE
+  $<$<BOOL:${CLANG_TIDY_ENABLE_STATIC_ANALYZER}>:
+    clangStaticAnalyzerCheckers
     clangStaticAnalyzerCore
     clangStaticAnalyzerFrontend
+  >
   )
-endif()
 
-# Checks.
-# If you add a check, also add it to ClangTidyForceLinker.h in this directory.
-add_subdirectory(android)
-add_subdirectory(abseil)
-add_subdirectory(altera)
-add_subdirectory(boost)
-add_subdirectory(bugprone)
-add_subdirectory(cert)
-add_subdirectory(concurrency)
-add_subdirectory(cppcoreguidelines)
-add_subdirectory(custom)
-add_subdirectory(darwin)
-add_subdirectory(fuchsia)
-add_subdirectory(google)
-add_subdirectory(hicpp)
-add_subdirectory(linuxkernel)
-add_subdirectory(llvm)
-add_subdirectory(llvmlibc)
-add_subdirectory(misc)
-add_subdirectory(modernize)
-if(CLANG_TIDY_ENABLE_STATIC_ANALYZER)
-  add_subdirectory(mpi)
-endif()
-add_subdirectory(objc)
-add_subdirectory(openmp)
-add_subdirectory(performance)
-add_subdirectory(portability)
-add_subdirectory(readability)
-add_subdirectory(zircon)
-set(ALL_CLANG_TIDY_CHECKS
-  clangTidyAndroidModule
-  clangTidyAbseilModule
-  clangTidyAlteraModule
-  clangTidyBoostModule
-  clangTidyBugproneModule
-  clangTidyCERTModule
-  clangTidyConcurrencyModule
-  clangTidyCppCoreGuidelinesModule
-  clangTidyDarwinModule
-  clangTidyFuchsiaModule
-  clangTidyGoogleModule
-  clangTidyHICPPModule
-  clangTidyLinuxKernelModule
-  clangTidyLLVMModule
-  clangTidyLLVMLibcModule
-  clangTidyMiscModule
-  clangTidyModernizeModule
-  clangTidyObjCModule
-  clangTidyOpenMPModule
-  clangTidyPerformanceModule
-  clangTidyPortabilityModule
-  clangTidyReadabilityModule
-  clangTidyZirconModule
+target_link_libraries(clangTidy
+  PRIVATE
+  clangIncludeCleaner
   )
 
-if(CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS)
-  list(APPEND ALL_CLANG_TIDY_CHECKS clangTidyCustomModule)
-endif()
-if(CLANG_TIDY_ENABLE_STATIC_ANALYZER)
-  list(APPEND ALL_CLANG_TIDY_CHECKS clangTidyMPIModule)
-endif()
-set(ALL_CLANG_TIDY_CHECKS ${ALL_CLANG_TIDY_CHECKS} PARENT_SCOPE)
-
-# Other subtargets. These may reference ALL_CLANG_TIDY_CHECKS
-# and must be below its definition.
-add_subdirectory(plugin)
 add_subdirectory(tool)
-add_subdirectory(utils)
 
 if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
   install(DIRECTORY .
diff --git a/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt
deleted file mode 100644
index 910e87615d017..0000000000000
--- a/clang-tools-extra/clang-tidy/abseil/CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  support
-  FrontendOpenMP
-  )
-
-add_clang_library(clangTidyAbseilModule STATIC
-  AbseilTidyModule.cpp
-  CleanupCtadCheck.cpp
-  DurationAdditionCheck.cpp
-  DurationComparisonCheck.cpp
-  DurationConversionCastCheck.cpp
-  DurationDivisionCheck.cpp
-  DurationFactoryFloatCheck.cpp
-  DurationFactoryScaleCheck.cpp
-  DurationRewriter.cpp
-  DurationSubtractionCheck.cpp
-  DurationUnnecessaryConversionCheck.cpp
-  FasterStrsplitDelimiterCheck.cpp
-  NoInternalDependenciesCheck.cpp
-  NoNamespaceCheck.cpp
-  RedundantStrcatCallsCheck.cpp
-  StrCatAppendCheck.cpp
-  StringFindStartswithCheck.cpp
-  StringFindStrContainsCheck.cpp
-  TimeComparisonCheck.cpp
-  TimeSubtractionCheck.cpp
-  UpgradeDurationConversionsCheck.cpp
-  UncheckedStatusOrAccessCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyAbseilModule
-  PRIVATE
-  clangAnalysisFlowSensitive
-  clangAnalysisFlowSensitiveModels
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  clangTooling
-  clangTransformer
-  )
diff --git a/clang-tools-extra/clang-tidy/altera/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/altera/CMakeLists.txt
deleted file mode 100644
index 5d9e7b3a023bb..0000000000000
--- a/clang-tools-extra/clang-tidy/altera/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  support
-  )
-
-add_clang_library(clangTidyAlteraModule STATIC
-  AlteraTidyModule.cpp
-  IdDependentBackwardBranchCheck.cpp
-  KernelNameRestrictionCheck.cpp
-  SingleWorkItemBarrierCheck.cpp
-  StructPackAlignCheck.cpp
-  UnrollLoopsCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyAlteraModule
-  PRIVATE
-  clangAnalysis
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  )
diff --git a/clang-tools-extra/clang-tidy/android/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/android/CMakeLists.txt
deleted file mode 100644
index b461730ef1418..0000000000000
--- a/clang-tools-extra/clang-tidy/android/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  support
-  FrontendOpenMP
-  )
-
-add_clang_library(clangTidyAndroidModule STATIC
-  AndroidTidyModule.cpp
-  CloexecAccept4Check.cpp
-  CloexecAcceptCheck.cpp
-  CloexecCheck.cpp
-  CloexecCreatCheck.cpp
-  CloexecDupCheck.cpp
-  CloexecEpollCreate1Check.cpp
-  CloexecEpollCreateCheck.cpp
-  CloexecFopenCheck.cpp
-  CloexecInotifyInit1Check.cpp
-  CloexecInotifyInitCheck.cpp
-  CloexecMemfdCreateCheck.cpp
-  CloexecOpenCheck.cpp
-  CloexecPipeCheck.cpp
-  CloexecPipe2Check.cpp
-  CloexecSocketCheck.cpp
-  ComparisonInTempFailureRetryCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyAndroidModule
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  )
diff --git a/clang-tools-extra/clang-tidy/boost/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/boost/CMakeLists.txt
deleted file mode 100644
index 9032771ec2fdc..0000000000000
--- a/clang-tools-extra/clang-tidy/boost/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  support
-  FrontendOpenMP
-  )
-
-add_clang_library(clangTidyBoostModule STATIC
-  BoostTidyModule.cpp
-  UseRangesCheck.cpp
-  UseToStringCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyBoostModule
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  )
diff --git a/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt
deleted file mode 100644
index db1256d91d311..0000000000000
--- a/clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt
+++ /dev/null
@@ -1,138 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  support
-  FrontendOpenMP
-  )
-
-add_clang_library(clangTidyBugproneModule STATIC
-  ArgumentCommentCheck.cpp
-  AssertSideEffectCheck.cpp
-  AssignmentInIfConditionCheck.cpp
-  BadSignalToKillThreadCheck.cpp
-  BitwisePointerCastCheck.cpp
-  BoolPointerImplicitConversionCheck.cpp
-  BranchCloneCheck.cpp
-  BugproneTidyModule.cpp
-  CapturingThisInMemberVariableCheck.cpp
-  CastingThroughVoidCheck.cpp
-  ChainedComparisonCheck.cpp
-  CommandProcessorCheck.cpp
-  ComparePointerToMemberVirtualFunctionCheck.cpp
-  CopyConstructorInitCheck.cpp
-  CopyConstructorMutatesArgumentCheck.cpp
-  CrtpConstructorAccessibilityCheck.cpp
-  DanglingHandleCheck.cpp
-  DefaultOperatorNewOnOveralignedTypeCheck.cpp
-  DerivedMethodShadowingBaseMethodCheck.cpp
-  DynamicStaticInitializersCheck.cpp
-  EasilySwappableParametersCheck.cpp
-  EmptyCatchCheck.cpp
-  ExceptionCopyConstructorThrowsCheck.cpp
-  ExceptionEscapeCheck.cpp
-  FloatLoopCounterCheck.cpp
-  FoldInitTypeCheck.cpp
-  ForwardDeclarationNamespaceCheck.cpp
-  ForwardingReferenceOverloadCheck.cpp
-  ImplicitWideningOfMultiplicationResultCheck.cpp
-  InaccurateEraseCheck.cpp
-  IncorrectEnableIfCheck.cpp
-  IncorrectEnableSharedFromThisCheck.cpp
-  InvalidEnumDefaultInitializationCheck.cpp
-  UnintendedCharOstreamOutputCheck.cpp
-  ReturnConstRefFromParameterCheck.cpp
-  SuspiciousStringviewDataUsageCheck.cpp
-  SwitchMissingDefaultCaseCheck.cpp
-  IncDecInConditionsCheck.cpp
-  IncorrectEnableIfCheck.cpp
-  IncorrectRoundingsCheck.cpp
-  InfiniteLoopCheck.cpp
-  IntegerDivisionCheck.cpp
-  LambdaFunctionNameCheck.cpp
-  MacroParenthesesCheck.cpp
-  MacroRepeatedSideEffectsCheck.cpp
-  MisleadingSetterOfReferenceCheck.cpp
-  MisplacedOperatorInStrlenInAllocCheck.cpp
-  MisplacedPointerArithmeticInAllocCheck.cpp
-  MisplacedWideningCastCheck.cpp
-  MoveForwardingReferenceCheck.cpp
-  MultiLevelImplicitPointerConversionCheck.cpp
-  MultipleNewInOneExpressionCheck.cpp
-  MultipleStatementMacroCheck.cpp
-  NarrowingConversionsCheck.cpp
-  NoEscapeCheck.cpp
-  NonZeroEnumToBoolConversionCheck.cpp
-  NondeterministicPointerIterationOrderCheck.cpp
-  NotNullTerminatedResultCheck.cpp
-  OptionalValueConversionCheck.cpp
-  ParentVirtualCallCheck.cpp
-  PointerArithmeticOnPolymorphicObjectCheck.cpp
-  PosixReturnCheck.cpp
-  RandomGeneratorSeedCheck.cpp
-  RawMemoryCallOnNonTrivialTypeCheck.cpp
-  RedundantBranchConditionCheck.cpp
-  ReservedIdentifierCheck.cpp
-  ReturnConstRefFromParameterCheck.cpp
-  SharedPtrArrayMismatchCheck.cpp
-  SignalHandlerCheck.cpp
-  SignedCharMisuseCheck.cpp
-  SizeofContainerCheck.cpp
-  SizeofExpressionCheck.cpp
-  SmartPtrArrayMismatchCheck.cpp
-  SpuriouslyWakeUpFunctionsCheck.cpp
-  StandaloneEmptyCheck.cpp
-  StdNamespaceModificationCheck.cpp
-  StringConstructorCheck.cpp
-  StringIntegerAssignmentCheck.cpp
-  StringLiteralWithEmbeddedNulCheck.cpp
-  StringviewNullptrCheck.cpp
-  SuspiciousEnumUsageCheck.cpp
-  SuspiciousIncludeCheck.cpp
-  SuspiciousMemoryComparisonCheck.cpp
-  SuspiciousMemsetUsageCheck.cpp
-  SuspiciousMissingCommaCheck.cpp
-  SuspiciousReallocUsageCheck.cpp
-  SuspiciousSemicolonCheck.cpp
-  SuspiciousStringCompareCheck.cpp
-  SuspiciousStringviewDataUsageCheck.cpp
-  SwappedArgumentsCheck.cpp
-  SwitchMissingDefaultCaseCheck.cpp
-  TaggedUnionMemberCountCheck.cpp
-  TerminatingContinueCheck.cpp
-  ThrowKeywordMissingCheck.cpp
-  ThrowingStaticInitializationCheck.cpp
-  TooSmallLoopVariableCheck.cpp
-  UncheckedOptionalAccessCheck.cpp
-  UncheckedStringToNumberConversionCheck.cpp
-  UndefinedMemoryManipulationCheck.cpp
-  UndelegatedConstructorCheck.cpp
-  UnhandledExceptionAtNewCheck.cpp
-  UnhandledSelfAssignmentCheck.cpp
-  UniquePtrArrayMismatchCheck.cpp
-  UnsafeFunctionsCheck.cpp
-  UnusedLocalNonTrivialVariableCheck.cpp
-  UnusedRaiiCheck.cpp
-  UnusedReturnValueCheck.cpp
-  UseAfterMoveCheck.cpp
-  VirtualNearMissCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyBugproneModule
-  PRIVATE
-  clangAnalysis
-  clangAnalysisFlowSensitive
-  clangAnalysisFlowSensitiveModels
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  clangSema
-  clangTooling
-  clangTransformer
-  )
diff --git a/clang-tools-extra/clang-tidy/cert/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/cert/CMakeLists.txt
deleted file mode 100644
index 313790374788d..0000000000000
--- a/clang-tools-extra/clang-tidy/cert/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  support
-  FrontendOpenMP
-  )
-
-add_clang_library(clangTidyCERTModule STATIC
-  CERTTidyModule.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyBugproneModule
-  clangTidyConcurrencyModule
-  clangTidyGoogleModule
-  clangTidyMiscModule
-  clangTidyModernizeModule
-  clangTidyPerformanceModule
-  clangTidyReadabilityModule
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyCERTModule
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  )
diff --git a/clang-tools-extra/clang-tidy/concurrency/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/concurrency/CMakeLists.txt
deleted file mode 100644
index 91c6cedabcc80..0000000000000
--- a/clang-tools-extra/clang-tidy/concurrency/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyConcurrencyModule STATIC
-  ConcurrencyTidyModule.cpp
-  MtUnsafeCheck.cpp
-  ThreadCanceltypeAsynchronousCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyConcurrencyModule
-  PRIVATE
-  clangAnalysis
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  clangSerialization
-  clangTooling
-  )
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt
deleted file mode 100644
index 4b3330d7e14c1..0000000000000
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/CMakeLists.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyCppCoreGuidelinesModule STATIC
-  AvoidCapturingLambdaCoroutinesCheck.cpp
-  AvoidConstOrRefDataMembersCheck.cpp
-  AvoidDoWhileCheck.cpp
-  AvoidGotoCheck.cpp
-  AvoidNonConstGlobalVariablesCheck.cpp
-  AvoidReferenceCoroutineParametersCheck.cpp
-  CppCoreGuidelinesTidyModule.cpp
-  InitVariablesCheck.cpp
-  InterfacesGlobalInitCheck.cpp
-  MacroUsageCheck.cpp
-  MisleadingCaptureDefaultByValueCheck.cpp
-  MissingStdForwardCheck.cpp
-  NoMallocCheck.cpp
-  NoSuspendWithLockCheck.cpp
-  OwningMemoryCheck.cpp
-  PreferMemberInitializerCheck.cpp
-  ProBoundsArrayToPointerDecayCheck.cpp
-  ProBoundsAvoidUncheckedContainerAccessCheck.cpp
-  ProBoundsConstantArrayIndexCheck.cpp
-  ProBoundsPointerArithmeticCheck.cpp
-  ProTypeConstCastCheck.cpp
-  ProTypeCstyleCastCheck.cpp
-  ProTypeMemberInitCheck.cpp
-  ProTypeReinterpretCastCheck.cpp
-  ProTypeStaticCastDowncastCheck.cpp
-  ProTypeUnionAccessCheck.cpp
-  ProTypeVarargCheck.cpp
-  RvalueReferenceParamNotMovedCheck.cpp
-  SlicingCheck.cpp
-  SpecialMemberFunctionsCheck.cpp
-  UseEnumClassCheck.cpp
-  VirtualClassDestructorCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyBugproneModule
-  clangTidyMiscModule
-  clangTidyModernizeModule
-  clangTidyPerformanceModule
-  clangTidyReadabilityModule
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyCppCoreGuidelinesModule
-  PRIVATE
-  clangAnalysis
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  clangSerialization
-  clangTooling
-  )
diff --git a/clang-tools-extra/clang-tidy/custom/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/custom/CMakeLists.txt
deleted file mode 100644
index 1af25a900113c..0000000000000
--- a/clang-tools-extra/clang-tidy/custom/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-if(CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS)
-  set(LLVM_LINK_COMPONENTS
-    FrontendOpenMP
-    support
-  )
-
-  add_clang_library(clangTidyCustomModule STATIC
-    CustomTidyModule.cpp
-    QueryCheck.cpp
-
-    LINK_LIBS
-    clangQuery
-    clangTidy
-    clangTidyBugproneModule
-    clangTidyMiscModule
-    clangTidyModernizeModule
-    clangTidyPerformanceModule
-    clangTidyReadabilityModule
-    clangTidyUtils
-
-    DEPENDS
-    omp_gen
-    ClangDriverOptions
-  )
-
-  clang_target_link_libraries(clangTidyCustomModule
-    PRIVATE
-    clangAnalysis
-    clangAST
-    clangASTMatchers
-    clangBasic
-    clangDynamicASTMatchers
-    clangFrontend
-    clangLex
-    clangSerialization
-    clangTooling
-  )
-endif()
diff --git a/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt
deleted file mode 100644
index d19e8144bcfa3..0000000000000
--- a/clang-tools-extra/clang-tidy/darwin/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyDarwinModule STATIC
-  AvoidSpinlockCheck.cpp
-  DarwinTidyModule.cpp
-  DispatchOnceNonstaticCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyDarwinModule
-  PRIVATE
-  clangAnalysis
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  )
diff --git a/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt
deleted file mode 100644
index dfd23c3bb48b0..0000000000000
--- a/clang-tools-extra/clang-tidy/fuchsia/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyFuchsiaModule STATIC
-  DefaultArgumentsCallsCheck.cpp
-  DefaultArgumentsDeclarationsCheck.cpp
-  FuchsiaTidyModule.cpp
-  OverloadedOperatorCheck.cpp
-  StaticallyConstructedObjectsCheck.cpp
-  TemporaryObjectsCheck.cpp
-  TrailingReturnCheck.cpp
-  VirtualInheritanceCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyGoogleModule
-  clangTidyMiscModule
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyFuchsiaModule
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  )
diff --git a/clang-tools-extra/clang-tidy/google/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/google/CMakeLists.txt
deleted file mode 100644
index 982a188e8e808..0000000000000
--- a/clang-tools-extra/clang-tidy/google/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyGoogleModule STATIC
-  AvoidNSObjectNewCheck.cpp
-  AvoidThrowingObjCExceptionCheck.cpp
-  AvoidUnderscoreInGoogletestNameCheck.cpp
-  DefaultArgumentsCheck.cpp
-  ExplicitConstructorCheck.cpp
-  ExplicitMakePairCheck.cpp
-  FloatTypesCheck.cpp
-  FunctionNamingCheck.cpp
-  GlobalNamesInHeadersCheck.cpp
-  GlobalVariableDeclarationCheck.cpp
-  GoogleTidyModule.cpp
-  IntegerTypesCheck.cpp
-  OverloadedUnaryAndCheck.cpp
-  TodoCommentCheck.cpp
-  UnnamedNamespaceInHeaderCheck.cpp
-  UpgradeGoogletestCaseCheck.cpp
-  UsingNamespaceDirectiveCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyModernizeModule
-  clangTidyReadabilityModule
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyGoogleModule
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  )
diff --git a/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt
deleted file mode 100644
index 2f31d168e65c0..0000000000000
--- a/clang-tools-extra/clang-tidy/hicpp/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyHICPPModule STATIC
-  ExceptionBaseclassCheck.cpp
-  HICPPTidyModule.cpp
-  IgnoredRemoveResultCheck.cpp
-  MultiwayPathsCoveredCheck.cpp
-  NoAssemblerCheck.cpp
-  SignedBitwiseCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyBugproneModule
-  clangTidyCppCoreGuidelinesModule
-  clangTidyGoogleModule
-  clangTidyMiscModule
-  clangTidyModernizeModule
-  clangTidyPerformanceModule
-  clangTidyReadabilityModule
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-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
deleted file mode 100644
index e7e2dcf9a82fe..0000000000000
--- a/clang-tools-extra/clang-tidy/linuxkernel/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyLinuxKernelModule STATIC
-  LinuxKernelTidyModule.cpp
-  MustCheckErrsCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyLinuxKernelModule
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  )
diff --git a/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt
deleted file mode 100644
index 78ef0444305ff..0000000000000
--- a/clang-tools-extra/clang-tidy/llvm/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyLLVMModule STATIC
-  HeaderGuardCheck.cpp
-  IncludeOrderCheck.cpp
-  LLVMTidyModule.cpp
-  PreferIsaOrDynCastInConditionalsCheck.cpp
-  PreferRegisterOverUnsignedCheck.cpp
-  PreferStaticOverAnonymousNamespaceCheck.cpp
-  TwineLocalCheck.cpp
-  UseNewMLIROpBuilderCheck.cpp
-  UseRangesCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyReadabilityModule
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyLLVMModule
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  clangTooling
-  clangTransformer
-  )
diff --git a/clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt
deleted file mode 100644
index eaeddf4f62857..0000000000000
--- a/clang-tools-extra/clang-tidy/llvmlibc/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyLLVMLibcModule STATIC
-  CalleeNamespaceCheck.cpp
-  ImplementationInNamespaceCheck.cpp
-  InlineFunctionDeclCheck.cpp
-  LLVMLibcTidyModule.cpp
-  RestrictSystemLibcHeadersCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyPortabilityModule
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyLLVMLibcModule
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  clangTooling
-  )
diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
index 86643eb28d65a..59c2d0ab90816 100644
--- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
@@ -1,14 +1,7 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
 setup_host_tool(clang-tidy-confusable-chars-gen 
CLANG_TIDY_CONFUSABLE_CHARS_GEN clang_tidy_confusable_chars_gen 
clang_tidy_confusable_chars_gen_target)
 
 add_subdirectory(ConfusableTable)
 
-include_directories(BEFORE 
"${CMAKE_CURRENT_SOURCE_DIR}/../../include-cleaner/include")
-
 add_custom_command(
     OUTPUT Confusables.inc
     COMMAND ${clang_tidy_confusable_chars_gen} 
${CMAKE_CURRENT_SOURCE_DIR}/ConfusableTable/confusables.txt 
${CMAKE_CURRENT_BINARY_DIR}/Confusables.inc
@@ -16,60 +9,3 @@ add_custom_command(
 
 add_custom_target(genconfusable DEPENDS Confusables.inc)
 set_target_properties(genconfusable PROPERTIES FOLDER "Clang Tools 
Extra/Sourcegenning")
-
-add_clang_library(clangTidyMiscModule STATIC
-  ConstCorrectnessCheck.cpp
-  CoroutineHostileRAIICheck.cpp
-  DefinitionsInHeadersCheck.cpp
-  ConfusableIdentifierCheck.cpp
-  HeaderIncludeCycleCheck.cpp
-  IncludeCleanerCheck.cpp
-  MiscTidyModule.cpp
-  MisleadingBidirectionalCheck.cpp
-  MisleadingIdentifierCheck.cpp
-  MisplacedConstCheck.cpp
-  MultipleInheritanceCheck.cpp
-  NewDeleteOverloadsCheck.cpp
-  NoRecursionCheck.cpp
-  NonCopyableObjectsCheck.cpp
-  NonPrivateMemberVariablesInClassesCheck.cpp
-  OverrideWithDifferentVisibilityCheck.cpp
-  PredictableRandCheck.cpp
-  RedundantExpressionCheck.cpp
-  StaticAssertCheck.cpp
-  ThrowByValueCatchByReferenceCheck.cpp
-  UnconventionalAssignOperatorCheck.cpp
-  UniqueptrResetReleaseCheck.cpp
-  UnusedAliasDeclsCheck.cpp
-  UnusedParametersCheck.cpp
-  UnusedUsingDeclsCheck.cpp
-  UseAnonymousNamespaceCheck.cpp
-  UseInternalLinkageCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  genconfusable
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyMiscModule
-  PRIVATE
-  clangAnalysis
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangFormat
-  clangLex
-  clangSerialization
-  clangTooling
-  clangToolingInclusions
-  clangToolingInclusionsStdlib
-  )
-target_link_libraries(clangTidyMiscModule
-  PRIVATE
-  clangIncludeCleaner
-  )
diff --git a/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
deleted file mode 100644
index 488c359661018..0000000000000
--- a/clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyModernizeModule STATIC
-  AvoidBindCheck.cpp
-  AvoidCArraysCheck.cpp
-  AvoidCStyleCastCheck.cpp
-  AvoidSetjmpLongjmpCheck.cpp
-  AvoidVariadicFunctionsCheck.cpp
-  ConcatNestedNamespacesCheck.cpp
-  DeprecatedHeadersCheck.cpp
-  DeprecatedIosBaseAliasesCheck.cpp
-  IntegralLiteralExpressionMatcher.cpp
-  LoopConvertCheck.cpp
-  LoopConvertUtils.cpp
-  MacroToEnumCheck.cpp
-  MakeSharedCheck.cpp
-  MakeSmartPtrCheck.cpp
-  MakeUniqueCheck.cpp
-  MinMaxUseInitializerListCheck.cpp
-  ModernizeTidyModule.cpp
-  PassByValueCheck.cpp
-  RawStringLiteralCheck.cpp
-  RedundantVoidArgCheck.cpp
-  ReplaceAutoPtrCheck.cpp
-  ReplaceDisallowCopyAndAssignMacroCheck.cpp
-  ReplaceRandomShuffleCheck.cpp
-  ReturnBracedInitListCheck.cpp
-  ShrinkToFitCheck.cpp
-  TypeTraitsCheck.cpp
-  UnaryStaticAssertCheck.cpp
-  UseAutoCheck.cpp
-  UseBoolLiteralsCheck.cpp
-  UseConstraintsCheck.cpp
-  UseDefaultMemberInitCheck.cpp
-  UseDesignatedInitializersCheck.cpp
-  UseEmplaceCheck.cpp
-  UseEqualsDefaultCheck.cpp
-  UseEqualsDeleteCheck.cpp
-  UseIntegerSignComparisonCheck.cpp
-  UseNodiscardCheck.cpp
-  UseNoexceptCheck.cpp
-  UseNullptrCheck.cpp
-  UseOverrideCheck.cpp
-  UseRangesCheck.cpp
-  UseScopedLockCheck.cpp
-  UseStartsEndsWithCheck.cpp
-  UseStdFormatCheck.cpp
-  UseStdNumbersCheck.cpp
-  UseStdPrintCheck.cpp
-  UseTrailingReturnTypeCheck.cpp
-  UseTransparentFunctorsCheck.cpp
-  UseUncaughtExceptionsCheck.cpp
-  UseUsingCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyReadabilityModule
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyModernizeModule
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  clangTooling
-  )
diff --git a/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt
deleted file mode 100644
index 1232a28c7cf7b..0000000000000
--- a/clang-tools-extra/clang-tidy/mpi/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyMPIModule STATIC
-  BufferDerefCheck.cpp
-  MPITidyModule.cpp
-  TypeMismatchCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyMPIModule
-  PRIVATE
-  clangAnalysis
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  clangTooling
-  clangStaticAnalyzerCheckers
-  )
diff --git a/clang-tools-extra/clang-tidy/objc/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/objc/CMakeLists.txt
deleted file mode 100644
index 2908d11e2a018..0000000000000
--- a/clang-tools-extra/clang-tidy/objc/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyObjCModule STATIC
-  AssertEqualsCheck.cpp
-  AvoidNSErrorInitCheck.cpp
-  DeallocInCategoryCheck.cpp
-  ForbiddenSubclassingCheck.cpp
-  MissingHashCheck.cpp
-  NSInvocationArgumentLifetimeCheck.cpp
-  NSDateFormatterCheck.cpp
-  ObjCTidyModule.cpp
-  PropertyDeclarationCheck.cpp
-  SuperSelfCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyObjCModule
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  )
diff --git a/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt
deleted file mode 100644
index acee08a48aeff..0000000000000
--- a/clang-tools-extra/clang-tidy/openmp/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyOpenMPModule STATIC
-  ExceptionEscapeCheck.cpp
-  OpenMPTidyModule.cpp
-  UseDefaultNoneCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  )
-
-clang_target_link_libraries(clangTidyOpenMPModule
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  )
diff --git a/clang-tools-extra/clang-tidy/performance/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/performance/CMakeLists.txt
deleted file mode 100644
index 9a2f90069edbf..0000000000000
--- a/clang-tools-extra/clang-tidy/performance/CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyPerformanceModule STATIC
-  AvoidEndlCheck.cpp
-  EnumSizeCheck.cpp
-  FasterStringFindCheck.cpp
-  ForRangeCopyCheck.cpp
-  ImplicitConversionInLoopCheck.cpp
-  InefficientAlgorithmCheck.cpp
-  InefficientStringConcatenationCheck.cpp
-  InefficientVectorOperationCheck.cpp
-  MoveConstArgCheck.cpp
-  MoveConstructorInitCheck.cpp
-  NoAutomaticMoveCheck.cpp
-  NoIntToPtrCheck.cpp
-  NoexceptDestructorCheck.cpp
-  NoexceptFunctionBaseCheck.cpp
-  NoexceptMoveConstructorCheck.cpp
-  NoexceptSwapCheck.cpp
-  PerformanceTidyModule.cpp
-  TriviallyDestructibleCheck.cpp
-  TypePromotionInMathFnCheck.cpp
-  UnnecessaryCopyInitializationCheck.cpp
-  UnnecessaryValueParamCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyPerformanceModule
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangAnalysis
-  clangBasic
-  clangLex
-  )
diff --git a/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt
deleted file mode 100644
index aff2018b693b1..0000000000000
--- a/clang-tools-extra/clang-tidy/plugin/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-add_clang_library(clangTidyPlugin STATIC
-  ClangTidyPlugin.cpp
-
-  LINK_LIBS
-  clangTidy
-  ${ALL_CLANG_TIDY_CHECKS}
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyPlugin
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangFrontend
-  clangSema
-  clangTooling
-  )
diff --git a/clang-tools-extra/clang-tidy/portability/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/portability/CMakeLists.txt
deleted file mode 100644
index 73d74a550afc0..0000000000000
--- a/clang-tools-extra/clang-tidy/portability/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  TargetParser
-  )
-
-add_clang_library(clangTidyPortabilityModule STATIC
-  AvoidPragmaOnceCheck.cpp
-  PortabilityTidyModule.cpp
-  RestrictSystemIncludesCheck.cpp
-  SIMDIntrinsicsCheck.cpp
-  StdAllocatorConstCheck.cpp
-  TemplateVirtualMemberFunctionCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyPortabilityModule
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  clangTooling
-  )
diff --git a/clang-tools-extra/clang-tidy/readability/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/readability/CMakeLists.txt
deleted file mode 100644
index 161a0d96caf41..0000000000000
--- a/clang-tools-extra/clang-tidy/readability/CMakeLists.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyReadabilityModule STATIC
-  AmbiguousSmartptrResetCallCheck.cpp
-  AvoidConstParamsInDeclsCheck.cpp
-  AvoidNestedConditionalOperatorCheck.cpp
-  AvoidReturnWithVoidValueCheck.cpp
-  AvoidUnconditionalPreprocessorIfCheck.cpp
-  BracesAroundStatementsCheck.cpp
-  ConstReturnTypeCheck.cpp
-  ContainerContainsCheck.cpp
-  ContainerDataPointerCheck.cpp
-  ContainerSizeEmptyCheck.cpp
-  ConvertMemberFunctionsToStaticCheck.cpp
-  DeleteNullPointerCheck.cpp
-  DuplicateIncludeCheck.cpp
-  ElseAfterReturnCheck.cpp
-  EnumInitialValueCheck.cpp
-  FunctionCognitiveComplexityCheck.cpp
-  FunctionSizeCheck.cpp
-  IdentifierLengthCheck.cpp
-  IdentifierNamingCheck.cpp
-  ImplicitBoolConversionCheck.cpp
-  RedundantInlineSpecifierCheck.cpp
-  InconsistentDeclarationParameterNameCheck.cpp
-  IsolateDeclarationCheck.cpp
-  MagicNumbersCheck.cpp
-  MakeMemberFunctionConstCheck.cpp
-  MathMissingParenthesesCheck.cpp
-  MisleadingIndentationCheck.cpp
-  MisplacedArrayIndexCheck.cpp
-  NamedParameterCheck.cpp
-  NamespaceCommentCheck.cpp
-  NonConstParameterCheck.cpp
-  OperatorsRepresentationCheck.cpp
-  QualifiedAutoCheck.cpp
-  ReadabilityTidyModule.cpp
-  RedundantAccessSpecifiersCheck.cpp
-  RedundantCastingCheck.cpp
-  RedundantControlFlowCheck.cpp
-  RedundantDeclarationCheck.cpp
-  RedundantFunctionPtrDereferenceCheck.cpp
-  RedundantMemberInitCheck.cpp
-  RedundantParenthesesCheck.cpp
-  RedundantPreprocessorCheck.cpp
-  RedundantSmartptrGetCheck.cpp
-  RedundantStringCStrCheck.cpp
-  RedundantStringInitCheck.cpp
-  RedundantTypenameCheck.cpp
-  ReferenceToConstructedTemporaryCheck.cpp
-  SimplifyBooleanExprCheck.cpp
-  SimplifySubscriptExprCheck.cpp
-  StaticAccessedThroughInstanceCheck.cpp
-  StaticDefinitionInAnonymousNamespaceCheck.cpp
-  StringCompareCheck.cpp
-  SuspiciousCallArgumentCheck.cpp
-  UniqueptrDeleteReleaseCheck.cpp
-  UppercaseLiteralSuffixCheck.cpp
-  UseAnyOfAllOfCheck.cpp
-  UseConcisePreprocessorDirectivesCheck.cpp
-  UseStdMinMaxCheck.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyReadabilityModule
-  PRIVATE
-  clangAnalysis
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  clangTooling
-  )
diff --git a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
index 0d4501d1eac06..9732531f1ef8c 100644
--- a/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/tool/CMakeLists.txt
@@ -15,7 +15,6 @@ add_clang_library(clangTidyMain STATIC
 
   LINK_LIBS
   clangTidy
-  ${ALL_CLANG_TIDY_CHECKS}
 
   DEPENDS
   omp_gen
@@ -55,7 +54,6 @@ target_link_libraries(clang-tidy
   PRIVATE
   clangTidy
   clangTidyMain
-  ${ALL_CLANG_TIDY_CHECKS}
   )
 
 if(CLANG_PLUGIN_SUPPORT)
diff --git a/clang-tools-extra/clang-tidy/utils/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/utils/CMakeLists.txt
deleted file mode 100644
index b83a1e9a77182..0000000000000
--- a/clang-tools-extra/clang-tidy/utils/CMakeLists.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyUtils STATIC
-  Aliasing.cpp
-  ASTUtils.cpp
-  BracesAroundStatement.cpp
-  DeclRefExprUtils.cpp
-  DesignatedInitializers.cpp
-  ExceptionAnalyzer.cpp
-  ExceptionSpecAnalyzer.cpp
-  ExprSequence.cpp
-  FileExtensionsUtils.cpp
-  FormatStringConverter.cpp
-  FixItHintUtils.cpp
-  HeaderGuard.cpp
-  IncludeInserter.cpp
-  IncludeSorter.cpp
-  LexerUtils.cpp
-  Matchers.cpp
-  NamespaceAliaser.cpp
-  OptionsUtils.cpp
-  RenamerClangTidyCheck.cpp
-  TransformerClangTidyCheck.cpp
-  TypeTraits.cpp
-  UseRangesCheck.cpp
-  UsingInserter.cpp
-
-  LINK_LIBS
-  clangTidy
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyUtils
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  clangSema
-  clangTooling
-  clangTransformer
-  )
diff --git a/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt
deleted file mode 100644
index bc4ab1f58c83d..0000000000000
--- a/clang-tools-extra/clang-tidy/zircon/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-set(LLVM_LINK_COMPONENTS
-  FrontendOpenMP
-  Support
-  )
-
-add_clang_library(clangTidyZirconModule STATIC
-  ZirconTidyModule.cpp
-
-  LINK_LIBS
-  clangTidy
-  clangTidyFuchsiaModule
-  clangTidyUtils
-
-  DEPENDS
-  omp_gen
-  ClangDriverOptions
-  )
-
-clang_target_link_libraries(clangTidyZirconModule
-  PRIVATE
-  clangAST
-  clangASTMatchers
-  clangBasic
-  clangLex
-  )
diff --git a/clang-tools-extra/clangd/CMakeLists.txt 
b/clang-tools-extra/clangd/CMakeLists.txt
index d7ec853af862f..726b22aea5470 100644
--- a/clang-tools-extra/clangd/CMakeLists.txt
+++ b/clang-tools-extra/clangd/CMakeLists.txt
@@ -185,13 +185,12 @@ target_link_libraries(clangDaemon
 
   clangIncludeCleaner
   clangTidy
-  clangTidyUtils
 
   clangdSupport
   )
-if(CLANGD_TIDY_CHECKS)
-  target_link_libraries(clangDaemon PRIVATE ${ALL_CLANG_TIDY_CHECKS})
-endif()
+#if(CLANGD_TIDY_CHECKS)
+#  target_link_libraries(clangDaemon PRIVATE ${ALL_CLANG_TIDY_CHECKS})
+#endif()
 
 add_subdirectory(refactor/tweaks)
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
diff --git a/clang-tools-extra/clangd/tool/CMakeLists.txt 
b/clang-tools-extra/clangd/tool/CMakeLists.txt
index 850a82833e444..c4b070b5ee3da 100644
--- a/clang-tools-extra/clangd/tool/CMakeLists.txt
+++ b/clang-tools-extra/clangd/tool/CMakeLists.txt
@@ -33,7 +33,6 @@ clang_target_link_libraries(clangdMain
 target_link_libraries(clangdMain
   PRIVATE
   clangTidy
-  clangTidyUtils
 
   clangDaemon
   clangdRemoteIndex
diff --git a/clang-tools-extra/clangd/unittests/CMakeLists.txt 
b/clang-tools-extra/clangd/unittests/CMakeLists.txt
index 2b1b6e079be38..49c2834af5d31 100644
--- a/clang-tools-extra/clangd/unittests/CMakeLists.txt
+++ b/clang-tools-extra/clangd/unittests/CMakeLists.txt
@@ -182,7 +182,6 @@ target_link_libraries(ClangdTests
   clangIncludeCleaner
   clangTesting
   clangTidy
-  clangTidyUtils
   clangdSupport
   )
 
diff --git a/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt 
b/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
index 64bf47e61736c..dd4e04f50d7ef 100644
--- a/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
+++ b/clang-tools-extra/unittests/clang-tidy/CMakeLists.txt
@@ -53,21 +53,6 @@ clang_target_link_libraries(ClangTidyTests
 target_link_libraries(ClangTidyTests
   PRIVATE
   clangTidy
-  clangTidyAndroidModule
-  clangTidyGoogleModule
-  clangTidyMiscModule
-  clangTidyLLVMModule
-  clangTidyModernizeModule
-  clangTidyObjCModule
-  clangTidyReadabilityModule
-  clangTidyUtils
   LLVMTestingAnnotations
   LLVMTestingSupport
   )
-
-if(CLANG_TIDY_ENABLE_QUERY_BASED_CUSTOM_CHECKS)
-  target_link_libraries(ClangTidyTests
-    PRIVATE
-    clangTidyCustomModule
-    )
-endif()

>From 13a6bbf564538567ca36e1e7b2969300375b712a Mon Sep 17 00:00:00 2001
From: Victor Chernyakin <[email protected]>
Date: Thu, 25 Dec 2025 22:10:00 -0700
Subject: [PATCH 2/2] Add deprecated targets

---
 clang-tools-extra/clang-tidy/CMakeLists.txt | 40 +++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/clang-tools-extra/clang-tidy/CMakeLists.txt 
b/clang-tools-extra/clang-tidy/CMakeLists.txt
index ccd005b2a692e..e69fe662032b0 100644
--- a/clang-tools-extra/clang-tidy/CMakeLists.txt
+++ b/clang-tools-extra/clang-tidy/CMakeLists.txt
@@ -569,3 +569,43 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
                              COMPONENT clang-tidy-headers)
   endif()
 endif()
+
+# TODO(LLVM 24): Remove these targets.
+foreach(deprecated_target IN ITEMS
+  clangTidyAndroidModule
+  clangTidyAbseilModule
+  clangTidyAlteraModule
+  clangTidyBoostModule
+  clangTidyBugproneModule
+  clangTidyCERTModule
+  clangTidyConcurrencyModule
+  clangTidyCppCoreGuidelinesModule
+  clangTidyCustomModule
+  clangTidyDarwinModule
+  clangTidyFuchsiaModule
+  clangTidyGoogleModule
+  clangTidyHICPPModule
+  clangTidyLinuxKernelModule
+  clangTidyLLVMModule
+  clangTidyLLVMLibcModule
+  clangTidyMiscModule
+  clangTidyMPIModule
+  clangTidyModernizeModule
+  clangTidyObjCModule
+  clangTidyOpenMPModule
+  clangTidyPerformanceModule
+  clangTidyPortabilityModule
+  clangTidyReadabilityModule
+  clangTidyZirconModule
+
+  clangTidyPlugin
+  clangTidyUtils
+)
+  add_library(${deprecated_target} INTERFACE)
+  target_link_libraries(${deprecated_target} INTERFACE clangTidy)
+  set_target_properties(${deprecated_target} PROPERTIES DEPRECATION 
+    "This target is deprecated and will be removed in LLVM 24. All of the \
+symbols it used to provide have been moved into the main 'clangTidy' \
+target, which you should link to instead."
+  )
+endforeach()

_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang-tools-extra] [clang-tidy] Refactor the build system (PR #173518)

Reply via email to