[CMake] Reorder and reformat deps

llvm · Apr 16, 2023 · 7d5d987 · 7d5d987
1 parent 20411c7
commit 7d5d987
Show file tree

Hide file tree

Showing 77 changed files with 166 additions and 149 deletions.
diff --git a/clang-tools-extra/clang-tidy/CMakeLists.txt b/clang-tools-extra/clang-tidy/CMakeLists.txt
@@ -26,9 +26,9 @@ add_clang_library(clangTidy
 
 clang_target_link_libraries(clangTidy
   PRIVATE
-  clangAnalysis
   clangAST
   clangASTMatchers
+  clangAnalysis
   clangBasic
   clangFormat
   clangFrontend

diff --git a/clang/lib/CodeGen/CMakeLists.txt b/clang/lib/CodeGen/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(LLVM_LINK_COMPONENTS
+  AggressiveInstCombine
   Analysis
   BitReader
   BitWriter
@@ -12,7 +13,6 @@ set(LLVM_LINK_COMPONENTS
   IPO
   IRPrinter
   IRReader
-  AggressiveInstCombine
   InstCombine
   Instrumentation
   LTO
@@ -93,8 +93,8 @@ add_clang_library(clangCodeGen
   intrinsics_gen
 
   LINK_LIBS
-  clangAnalysis
   clangAST
+  clangAnalysis
   clangBasic
   clangFrontend
   clangLex

diff --git a/clang/lib/Interpreter/CMakeLists.txt b/clang/lib/Interpreter/CMakeLists.txt
@@ -21,13 +21,13 @@ add_clang_library(clangInterpreter
   clangAST
   clangAnalysis
   clangBasic
+  clangCodeGen
   clangDriver
   clangEdit
   clangFrontend
+  clangFrontendTool
   clangLex
   clangParse
   clangSema
   clangSerialization
-  clangCodeGen
-  clangFrontendTool
   )
diff --git a/clang/lib/Tooling/DependencyScanning/CMakeLists.txt b/clang/lib/Tooling/DependencyScanning/CMakeLists.txt
@@ -27,4 +27,4 @@ add_clang_library(clangDependencyScanning
   clangParse
   clangSerialization
   clangTooling
-)
+  )
diff --git a/clang/tools/clang-scan-deps/CMakeLists.txt b/clang/tools/clang-scan-deps/CMakeLists.txt
@@ -20,14 +20,14 @@ set(CLANG_SCAN_DEPS_LIB_DEPS
   clangAST
   clangBasic
   clangCodeGen
+  clangDependencyScanning
   clangDriver
   clangFrontend
   clangFrontendTool
   clangLex
   clangParse
   clangSerialization
   clangTooling
-  clangDependencyScanning
   )
 
 clang_target_link_libraries(clang-scan-deps

diff --git a/clang/unittests/Analysis/CMakeLists.txt b/clang/unittests/Analysis/CMakeLists.txt
@@ -14,9 +14,9 @@ add_clang_unittest(ClangAnalysisTests
 
 clang_target_link_libraries(ClangAnalysisTests
   PRIVATE
-  clangAnalysis
   clangAST
   clangASTMatchers
+  clangAnalysis
   clangBasic
   clangFrontend
   clangLex

diff --git a/clang/unittests/Analysis/FlowSensitive/CMakeLists.txt b/clang/unittests/Analysis/FlowSensitive/CMakeLists.txt
@@ -27,11 +27,11 @@ add_clang_unittest(ClangAnalysisFlowSensitiveTests
 
 clang_target_link_libraries(ClangAnalysisFlowSensitiveTests
   PRIVATE
+  clangAST
+  clangASTMatchers
   clangAnalysis
   clangAnalysisFlowSensitive
   clangAnalysisFlowSensitiveModels
-  clangAST
-  clangASTMatchers
   clangBasic
   clangFrontend
   clangLex

diff --git a/clang/unittests/DirectoryWatcher/CMakeLists.txt b/clang/unittests/DirectoryWatcher/CMakeLists.txt
@@ -11,8 +11,8 @@ if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME STREQUAL Wind
   target_link_libraries(DirectoryWatcherTests
     PRIVATE
     LLVMTestingSupport
-    clangDirectoryWatcher
     clangBasic
+    clangDirectoryWatcher
     )
 
 endif()
diff --git a/clang/unittests/Introspection/CMakeLists.txt b/clang/unittests/Introspection/CMakeLists.txt
@@ -11,10 +11,10 @@ clang_target_link_libraries(IntrospectionTests
   PRIVATE
   clangAST
   clangASTMatchers
-  clangTooling
   clangBasic
-  clangSerialization
   clangFrontend
+  clangSerialization
+  clangTooling
   )
 target_link_libraries(IntrospectionTests
   PRIVATE

diff --git a/clang/unittests/Sema/CMakeLists.txt b/clang/unittests/Sema/CMakeLists.txt
@@ -24,7 +24,7 @@ clang_target_link_libraries(SemaTests
 
 target_link_libraries(SemaTests
   PRIVATE
-  clangTesting
   LLVMTestingAnnotations
   LLVMTestingSupport
-)
+  clangTesting
+  )
diff --git a/llvm/lib/DWARFLinker/CMakeLists.txt b/llvm/lib/DWARFLinker/CMakeLists.txt
@@ -11,10 +11,10 @@ add_llvm_component_library(LLVMDWARFLinker
   intrinsics_gen
 
   LINK_COMPONENTS
-  BinaryFormat
-  DebugInfoDWARF
   AsmPrinter
+  BinaryFormat
   CodeGen
+  DebugInfoDWARF
   MC
   Object
   Support

diff --git a/llvm/lib/DWARFLinkerParallel/CMakeLists.txt b/llvm/lib/DWARFLinkerParallel/CMakeLists.txt
@@ -9,11 +9,11 @@ add_llvm_component_library(LLVMDWARFLinkerParallel
   intrinsics_gen
 
   LINK_COMPONENTS
-  BinaryFormat
-  DebugInfoDWARF
   AsmPrinter
+  BinaryFormat
   CodeGen
+  DebugInfoDWARF
   MC
   Object
   Support
-)
+  )
diff --git a/llvm/lib/DWP/CMakeLists.txt b/llvm/lib/DWP/CMakeLists.txt
@@ -14,4 +14,4 @@ add_llvm_component_library(LLVMDWP
   Object
   Support
   Target
-)
+  )
diff --git a/llvm/lib/LTO/CMakeLists.txt b/llvm/lib/LTO/CMakeLists.txt
@@ -36,4 +36,4 @@ add_llvm_component_library(LLVMLTO
   Target
   TargetParser
   TransformUtils
-)
+  )
diff --git a/llvm/lib/Target/AArch64/CMakeLists.txt b/llvm/lib/Target/AArch64/CMakeLists.txt
@@ -97,21 +97,21 @@ add_llvm_target(AArch64CodeGen
   AArch64Utils
   Analysis
   AsmPrinter
+  CFGuard
   CodeGen
   Core
+  GlobalISel
   MC
   Scalar
   SelectionDAG
   Support
   Target
   TargetParser
   TransformUtils
-  GlobalISel
-  CFGuard
 
   ADD_TO_COMPONENT
   AArch64
-)
+  )
 
 add_subdirectory(AsmParser)
 add_subdirectory(Disassembler)

diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt
@@ -15,14 +15,15 @@ add_llvm_component_library(LLVMAArch64Desc
   LINK_COMPONENTS
   AArch64Info
   AArch64Utils
-  MC
   BinaryFormat
+  MC
   Support
   TargetParser
 
   ADD_TO_COMPONENT
   AArch64
-)
+  )
+
 add_dependencies(LLVMAArch64Desc AArch64CommonTableGen)
 
 # Hack: we need to include 'main' target directory to grab private headers

diff --git a/llvm/lib/Target/AMDGPU/AsmParser/CMakeLists.txt b/llvm/lib/Target/AMDGPU/AsmParser/CMakeLists.txt
@@ -2,11 +2,11 @@ add_llvm_component_library(LLVMAMDGPUAsmParser
   AMDGPUAsmParser.cpp
 
   LINK_COMPONENTS
-  MC
-  MCParser
   AMDGPUDesc
   AMDGPUInfo
   AMDGPUUtils
+  MC
+  MCParser
   Support
   TargetParser
 

diff --git a/llvm/lib/Target/AMDGPU/CMakeLists.txt b/llvm/lib/Target/AMDGPU/CMakeLists.txt
@@ -165,26 +165,26 @@ add_llvm_target(AMDGPUCodeGen
   SIWholeQuadMode.cpp
 
   LINK_COMPONENTS
+  AMDGPUDesc
+  AMDGPUInfo
+  AMDGPUUtils
   Analysis
   AsmPrinter
+  BinaryFormat
   CodeGen
   Core
+  GlobalISel
   IPO
   MC
+  MIRParser
   Passes
-  AMDGPUDesc
-  AMDGPUInfo
-  AMDGPUUtils
   Scalar
   SelectionDAG
   Support
   Target
   TargetParser
   TransformUtils
   Vectorize
-  GlobalISel
-  BinaryFormat
-  MIRParser
 
   ADD_TO_COMPONENT
   AMDGPU

diff --git a/llvm/lib/Target/AMDGPU/MCA/CMakeLists.txt b/llvm/lib/Target/AMDGPU/MCA/CMakeLists.txt
@@ -2,14 +2,14 @@ add_llvm_component_library(LLVMAMDGPUTargetMCA
   AMDGPUCustomBehaviour.cpp
 
   LINK_COMPONENTS
-  MC
-  MCParser
   AMDGPUDesc
   AMDGPUInfo
   AMDGPUUtils
+  MC
+  MCA
+  MCParser
   Support
   TargetParser
-  MCA
 
   ADD_TO_COMPONENT
   AMDGPU

diff --git a/llvm/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt
@@ -13,16 +13,16 @@ add_llvm_component_library(LLVMAMDGPUDesc
   SIMCCodeEmitter.cpp
 
   LINK_COMPONENTS
-  Core
-  MC
   AMDGPUInfo
   AMDGPUUtils
-  Support
   BinaryFormat
+  Core
+  MC
+  Support
   TargetParser
 
   ADD_TO_COMPONENT
   AMDGPU
-)
+  )
 
 add_dependencies(LLVMAMDGPUDesc LLVMAMDGPUUtils)
diff --git a/llvm/lib/Target/AMDGPU/Utils/CMakeLists.txt b/llvm/lib/Target/AMDGPU/Utils/CMakeLists.txt
@@ -7,9 +7,9 @@ add_llvm_component_library(LLVMAMDGPUUtils
 
   LINK_COMPONENTS
   Analysis
+  BinaryFormat
   Core
   MC
-  BinaryFormat
   Support
   TargetParser
 

diff --git a/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt b/llvm/lib/Target/ARM/AsmParser/CMakeLists.txt
@@ -4,11 +4,11 @@ add_llvm_component_library(LLVMARMAsmParser
   LINK_COMPONENTS
   ARMDesc
   ARMInfo
+  ARMUtils
   MC
   MCParser
   Support
   TargetParser
-  ARMUtils
 
   ADD_TO_COMPONENT
   ARM

diff --git a/llvm/lib/Target/ARM/CMakeLists.txt b/llvm/lib/Target/ARM/CMakeLists.txt
@@ -72,21 +72,21 @@ add_llvm_target(ARMCodeGen
   LINK_COMPONENTS
   ARMDesc
   ARMInfo
+  ARMUtils
   Analysis
   AsmPrinter
+  CFGuard
   CodeGen
   Core
+  GlobalISel
   IPO
   MC
   Scalar
   SelectionDAG
   Support
   Target
   TargetParser
-  GlobalISel
-  ARMUtils
   TransformUtils
-  CFGuard
 
   ADD_TO_COMPONENT
   ARM

diff --git a/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt b/llvm/lib/Target/ARM/Disassembler/CMakeLists.txt
@@ -4,10 +4,10 @@ add_llvm_component_library(LLVMARMDisassembler
   LINK_COMPONENTS
   ARMDesc
   ARMInfo
-  MCDisassembler
+  ARMUtils
   MC
+  MCDisassembler
   Support
-  ARMUtils
 
   ADD_TO_COMPONENT
   ARM

diff --git a/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt
@@ -17,10 +17,10 @@ add_llvm_component_library(LLVMARMDesc
   LINK_COMPONENTS
   ARMInfo
   ARMUtils
+  BinaryFormat
   MC
   MCDisassembler
   Support
-  BinaryFormat
   TargetParser
 
   ADD_TO_COMPONENT

diff --git a/llvm/lib/Target/AVR/AsmParser/CMakeLists.txt b/llvm/lib/Target/AVR/AsmParser/CMakeLists.txt
@@ -2,12 +2,12 @@ add_llvm_component_library(LLVMAVRAsmParser
   AVRAsmParser.cpp
 
   LINK_COMPONENTS
-  MC
-  MCParser
   AVRDesc
   AVRInfo
+  MC
+  MCParser
   Support
 
   ADD_TO_COMPONENT
   AVR
-)
+  )