Skip to content

Commit 7d5d987

Browse files
committed
[CMake] Reorder and reformat deps
1 parent 20411c7 commit 7d5d987

File tree

77 files changed

+166
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+166
-149
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ add_clang_library(clangTidy
2626

2727
clang_target_link_libraries(clangTidy
2828
PRIVATE
29-
clangAnalysis
3029
clangAST
3130
clangASTMatchers
31+
clangAnalysis
3232
clangBasic
3333
clangFormat
3434
clangFrontend

clang/lib/CodeGen/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
set(LLVM_LINK_COMPONENTS
2+
AggressiveInstCombine
23
Analysis
34
BitReader
45
BitWriter
@@ -12,7 +13,6 @@ set(LLVM_LINK_COMPONENTS
1213
IPO
1314
IRPrinter
1415
IRReader
15-
AggressiveInstCombine
1616
InstCombine
1717
Instrumentation
1818
LTO
@@ -93,8 +93,8 @@ add_clang_library(clangCodeGen
9393
intrinsics_gen
9494

9595
LINK_LIBS
96-
clangAnalysis
9796
clangAST
97+
clangAnalysis
9898
clangBasic
9999
clangFrontend
100100
clangLex

clang/lib/Interpreter/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ add_clang_library(clangInterpreter
2121
clangAST
2222
clangAnalysis
2323
clangBasic
24+
clangCodeGen
2425
clangDriver
2526
clangEdit
2627
clangFrontend
28+
clangFrontendTool
2729
clangLex
2830
clangParse
2931
clangSema
3032
clangSerialization
31-
clangCodeGen
32-
clangFrontendTool
3333
)

clang/lib/Tooling/DependencyScanning/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ add_clang_library(clangDependencyScanning
2727
clangParse
2828
clangSerialization
2929
clangTooling
30-
)
30+
)

clang/tools/clang-scan-deps/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ set(CLANG_SCAN_DEPS_LIB_DEPS
2020
clangAST
2121
clangBasic
2222
clangCodeGen
23+
clangDependencyScanning
2324
clangDriver
2425
clangFrontend
2526
clangFrontendTool
2627
clangLex
2728
clangParse
2829
clangSerialization
2930
clangTooling
30-
clangDependencyScanning
3131
)
3232

3333
clang_target_link_libraries(clang-scan-deps

clang/unittests/Analysis/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ add_clang_unittest(ClangAnalysisTests
1414

1515
clang_target_link_libraries(ClangAnalysisTests
1616
PRIVATE
17-
clangAnalysis
1817
clangAST
1918
clangASTMatchers
19+
clangAnalysis
2020
clangBasic
2121
clangFrontend
2222
clangLex

clang/unittests/Analysis/FlowSensitive/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ add_clang_unittest(ClangAnalysisFlowSensitiveTests
2727

2828
clang_target_link_libraries(ClangAnalysisFlowSensitiveTests
2929
PRIVATE
30+
clangAST
31+
clangASTMatchers
3032
clangAnalysis
3133
clangAnalysisFlowSensitive
3234
clangAnalysisFlowSensitiveModels
33-
clangAST
34-
clangASTMatchers
3535
clangBasic
3636
clangFrontend
3737
clangLex

clang/unittests/DirectoryWatcher/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME STREQUAL Wind
1111
target_link_libraries(DirectoryWatcherTests
1212
PRIVATE
1313
LLVMTestingSupport
14-
clangDirectoryWatcher
1514
clangBasic
15+
clangDirectoryWatcher
1616
)
1717

1818
endif()

clang/unittests/Introspection/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ clang_target_link_libraries(IntrospectionTests
1111
PRIVATE
1212
clangAST
1313
clangASTMatchers
14-
clangTooling
1514
clangBasic
16-
clangSerialization
1715
clangFrontend
16+
clangSerialization
17+
clangTooling
1818
)
1919
target_link_libraries(IntrospectionTests
2020
PRIVATE

clang/unittests/Sema/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ clang_target_link_libraries(SemaTests
2424

2525
target_link_libraries(SemaTests
2626
PRIVATE
27-
clangTesting
2827
LLVMTestingAnnotations
2928
LLVMTestingSupport
30-
)
29+
clangTesting
30+
)

llvm/lib/DWARFLinker/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ add_llvm_component_library(LLVMDWARFLinker
1111
intrinsics_gen
1212

1313
LINK_COMPONENTS
14-
BinaryFormat
15-
DebugInfoDWARF
1614
AsmPrinter
15+
BinaryFormat
1716
CodeGen
17+
DebugInfoDWARF
1818
MC
1919
Object
2020
Support

llvm/lib/DWARFLinkerParallel/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ add_llvm_component_library(LLVMDWARFLinkerParallel
99
intrinsics_gen
1010

1111
LINK_COMPONENTS
12-
BinaryFormat
13-
DebugInfoDWARF
1412
AsmPrinter
13+
BinaryFormat
1514
CodeGen
15+
DebugInfoDWARF
1616
MC
1717
Object
1818
Support
19-
)
19+
)

llvm/lib/DWP/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ add_llvm_component_library(LLVMDWP
1414
Object
1515
Support
1616
Target
17-
)
17+
)

llvm/lib/LTO/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ add_llvm_component_library(LLVMLTO
3636
Target
3737
TargetParser
3838
TransformUtils
39-
)
39+
)

llvm/lib/Target/AArch64/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,21 +97,21 @@ add_llvm_target(AArch64CodeGen
9797
AArch64Utils
9898
Analysis
9999
AsmPrinter
100+
CFGuard
100101
CodeGen
101102
Core
103+
GlobalISel
102104
MC
103105
Scalar
104106
SelectionDAG
105107
Support
106108
Target
107109
TargetParser
108110
TransformUtils
109-
GlobalISel
110-
CFGuard
111111

112112
ADD_TO_COMPONENT
113113
AArch64
114-
)
114+
)
115115

116116
add_subdirectory(AsmParser)
117117
add_subdirectory(Disassembler)

llvm/lib/Target/AArch64/MCTargetDesc/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@ add_llvm_component_library(LLVMAArch64Desc
1515
LINK_COMPONENTS
1616
AArch64Info
1717
AArch64Utils
18-
MC
1918
BinaryFormat
19+
MC
2020
Support
2121
TargetParser
2222

2323
ADD_TO_COMPONENT
2424
AArch64
25-
)
25+
)
26+
2627
add_dependencies(LLVMAArch64Desc AArch64CommonTableGen)
2728

2829
# Hack: we need to include 'main' target directory to grab private headers

llvm/lib/Target/AMDGPU/AsmParser/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ add_llvm_component_library(LLVMAMDGPUAsmParser
22
AMDGPUAsmParser.cpp
33

44
LINK_COMPONENTS
5-
MC
6-
MCParser
75
AMDGPUDesc
86
AMDGPUInfo
97
AMDGPUUtils
8+
MC
9+
MCParser
1010
Support
1111
TargetParser
1212

llvm/lib/Target/AMDGPU/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,26 +165,26 @@ add_llvm_target(AMDGPUCodeGen
165165
SIWholeQuadMode.cpp
166166

167167
LINK_COMPONENTS
168+
AMDGPUDesc
169+
AMDGPUInfo
170+
AMDGPUUtils
168171
Analysis
169172
AsmPrinter
173+
BinaryFormat
170174
CodeGen
171175
Core
176+
GlobalISel
172177
IPO
173178
MC
179+
MIRParser
174180
Passes
175-
AMDGPUDesc
176-
AMDGPUInfo
177-
AMDGPUUtils
178181
Scalar
179182
SelectionDAG
180183
Support
181184
Target
182185
TargetParser
183186
TransformUtils
184187
Vectorize
185-
GlobalISel
186-
BinaryFormat
187-
MIRParser
188188

189189
ADD_TO_COMPONENT
190190
AMDGPU

llvm/lib/Target/AMDGPU/MCA/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ add_llvm_component_library(LLVMAMDGPUTargetMCA
22
AMDGPUCustomBehaviour.cpp
33

44
LINK_COMPONENTS
5-
MC
6-
MCParser
75
AMDGPUDesc
86
AMDGPUInfo
97
AMDGPUUtils
8+
MC
9+
MCA
10+
MCParser
1011
Support
1112
TargetParser
12-
MCA
1313

1414
ADD_TO_COMPONENT
1515
AMDGPU

llvm/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ add_llvm_component_library(LLVMAMDGPUDesc
1313
SIMCCodeEmitter.cpp
1414

1515
LINK_COMPONENTS
16-
Core
17-
MC
1816
AMDGPUInfo
1917
AMDGPUUtils
20-
Support
2118
BinaryFormat
19+
Core
20+
MC
21+
Support
2222
TargetParser
2323

2424
ADD_TO_COMPONENT
2525
AMDGPU
26-
)
26+
)
2727

2828
add_dependencies(LLVMAMDGPUDesc LLVMAMDGPUUtils)

llvm/lib/Target/AMDGPU/Utils/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ add_llvm_component_library(LLVMAMDGPUUtils
77

88
LINK_COMPONENTS
99
Analysis
10+
BinaryFormat
1011
Core
1112
MC
12-
BinaryFormat
1313
Support
1414
TargetParser
1515

llvm/lib/Target/ARM/AsmParser/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ add_llvm_component_library(LLVMARMAsmParser
44
LINK_COMPONENTS
55
ARMDesc
66
ARMInfo
7+
ARMUtils
78
MC
89
MCParser
910
Support
1011
TargetParser
11-
ARMUtils
1212

1313
ADD_TO_COMPONENT
1414
ARM

llvm/lib/Target/ARM/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,21 @@ add_llvm_target(ARMCodeGen
7272
LINK_COMPONENTS
7373
ARMDesc
7474
ARMInfo
75+
ARMUtils
7576
Analysis
7677
AsmPrinter
78+
CFGuard
7779
CodeGen
7880
Core
81+
GlobalISel
7982
IPO
8083
MC
8184
Scalar
8285
SelectionDAG
8386
Support
8487
Target
8588
TargetParser
86-
GlobalISel
87-
ARMUtils
8889
TransformUtils
89-
CFGuard
9090

9191
ADD_TO_COMPONENT
9292
ARM

llvm/lib/Target/ARM/Disassembler/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ add_llvm_component_library(LLVMARMDisassembler
44
LINK_COMPONENTS
55
ARMDesc
66
ARMInfo
7-
MCDisassembler
7+
ARMUtils
88
MC
9+
MCDisassembler
910
Support
10-
ARMUtils
1111

1212
ADD_TO_COMPONENT
1313
ARM

llvm/lib/Target/ARM/MCTargetDesc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ add_llvm_component_library(LLVMARMDesc
1717
LINK_COMPONENTS
1818
ARMInfo
1919
ARMUtils
20+
BinaryFormat
2021
MC
2122
MCDisassembler
2223
Support
23-
BinaryFormat
2424
TargetParser
2525

2626
ADD_TO_COMPONENT

llvm/lib/Target/AVR/AsmParser/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ add_llvm_component_library(LLVMAVRAsmParser
22
AVRAsmParser.cpp
33

44
LINK_COMPONENTS
5-
MC
6-
MCParser
75
AVRDesc
86
AVRInfo
7+
MC
8+
MCParser
99
Support
1010

1111
ADD_TO_COMPONENT
1212
AVR
13-
)
13+
)

0 commit comments

Comments
 (0)