Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit 921fa37

Browse files
committed
[CMake] clang/lib: Satisfy dependencies to add *actually used* libraries on target_link_libraries() and LLVM_LINK_COMPONENTS.
I will prune redundant dependencies later. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@196800 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 6b4f436 commit 921fa37

File tree

18 files changed

+114
-26
lines changed

18 files changed

+114
-26
lines changed

lib/ARCMigrate/CMakeLists.txt

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
set(LLVM_LINK_COMPONENTS
2+
Support
3+
)
4+
15
add_clang_library(clangARCMigrate
26
ARCMT.cpp
37
ARCMTActions.cpp
@@ -34,11 +38,16 @@ add_dependencies(clangARCMigrate
3438
)
3539

3640
target_link_libraries(clangARCMigrate
37-
clangBasic
3841
clangAST
39-
clangParse
42+
clangAnalysis
43+
clangBasic
44+
clangEdit
4045
clangFrontend
46+
clangLex
47+
clangParse
4148
clangRewriteCore
4249
clangRewriteFrontend
50+
clangSema
51+
clangSerialization
4352
clangStaticAnalyzerCheckers
4453
)

lib/ASTMatchers/Dynamic/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ add_dependencies(clangDynamicASTMatchers
1212
)
1313

1414
target_link_libraries(clangDynamicASTMatchers
15+
clangAST
1516
clangASTMatchers
17+
clangBasic
1618
)

lib/Analysis/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
set(LLVM_LINK_COMPONENTS
2+
MC
3+
Support
4+
)
5+
16
add_clang_library(clangAnalysis
27
AnalysisDeclContext.cpp
38
BodyFarm.cpp

lib/Basic/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
set(LLVM_LINK_COMPONENTS mc)
1+
set(LLVM_LINK_COMPONENTS
2+
MC
3+
Support
4+
)
25

36
add_clang_library(clangBasic
47
Builtins.cpp

lib/CodeGen/CMakeLists.txt

+16-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
11
set(LLVM_LINK_COMPONENTS
2-
asmparser
3-
bitreader
4-
bitwriter
5-
irreader
6-
instrumentation
7-
ipo
8-
linker
9-
vectorize
2+
AsmParser
3+
BitReader
4+
BitWriter
5+
Core
6+
IPO
7+
IRReader
8+
InstCombine
9+
Instrumentation
10+
Linker
11+
MC
12+
ObjCARCOpts
13+
ScalarOpts
14+
Support
15+
Target
16+
TransformUtils
17+
Vectorize
1018
)
1119

1220
add_clang_library(clangCodeGen

lib/Edit/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
set(LLVM_LINK_COMPONENTS
2+
Support
3+
)
4+
15
add_clang_library(clangEdit
26
Commit.cpp
37
EditedSource.cpp

lib/Format/CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ add_dependencies(clangFormat
2020
)
2121

2222
target_link_libraries(clangFormat
23-
clangBasic
24-
clangFrontend
2523
clangAST
2624
clangASTMatchers
25+
clangBasic
26+
clangFrontend
27+
clangLex
2728
clangRewriteCore
2829
clangRewriteFrontend
2930
clangTooling

lib/Frontend/CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
set(LLVM_LINK_COMPONENTS
2+
Option
3+
Support
4+
)
5+
16
add_clang_library(clangFrontend
27
ASTConsumers.cpp
38
ASTMerge.cpp

lib/FrontendTool/CMakeLists.txt

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
set(LLVM_LINK_COMPONENTS
2+
Option
3+
Support
4+
)
5+
16
add_clang_library(clangFrontendTool
27
ExecuteCompilerInvocation.cpp
38
)
@@ -9,11 +14,12 @@ add_dependencies(clangFrontendTool
914
)
1015

1116
target_link_libraries(clangFrontendTool
17+
clangBasic
18+
clangCodeGen
1219
clangDriver
1320
clangFrontend
1421
clangRewriteCore
1522
clangRewriteFrontend
16-
clangCodeGen
1723
)
1824

1925
if(CLANG_ENABLE_ARCMT)

lib/Index/CMakeLists.txt

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
1+
set(LLVM_LINK_COMPONENTS
2+
Support
3+
)
4+
15
add_clang_library(clangIndex
26
CommentToXML.cpp
37
SimpleFormatContext.h
48
USRGeneration.cpp
59
)
610

711
target_link_libraries(clangIndex
8-
clangBasic
912
clangAST
13+
clangBasic
1014
clangFormat
15+
clangLex
16+
clangRewriteCore
17+
clangTooling
1118
)

lib/Parse/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
set(LLVM_LINK_COMPONENTS
2+
MCParser
3+
MC
4+
Support
5+
)
6+
17
add_clang_library(clangParse
28
ParseAST.cpp
39
ParseCXXInlineMethods.cpp

lib/Rewrite/Core/CMakeLists.txt

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
set(LLVM_LINK_COMPONENTS
2+
Support
3+
)
4+
15
add_clang_library(clangRewriteCore
26
DeltaTree.cpp
37
HTMLRewrite.cpp
@@ -18,7 +22,8 @@ add_dependencies(clangRewriteCore
1822
)
1923

2024
target_link_libraries(clangRewriteCore
21-
clangBasic
2225
clangAST
26+
clangBasic
27+
clangLex
2328
clangParse
2429
)

lib/Rewrite/Frontend/CMakeLists.txt

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
set(LLVM_LINK_COMPONENTS
2+
Support
3+
)
4+
15
add_clang_library(clangRewriteFrontend
26
FixItRewriter.cpp
37
FrontendActions.cpp
@@ -21,9 +25,11 @@ add_dependencies(clangRewriteFrontend
2125
)
2226

2327
target_link_libraries(clangRewriteFrontend
24-
clangBasic
2528
clangAST
26-
clangParse
29+
clangBasic
30+
clangEdit
2731
clangFrontend
32+
clangLex
33+
clangParse
2834
clangRewriteCore
2935
)

lib/Serialization/CMakeLists.txt

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
set(LLVM_LINK_COMPONENTS bitreader)
1+
set(LLVM_LINK_COMPONENTS
2+
BitReader
3+
Support
4+
)
5+
26

37
add_clang_library(clangSerialization
48
ASTCommon.h
@@ -32,5 +36,8 @@ add_dependencies(clangSerialization
3236
)
3337

3438
target_link_libraries(clangSerialization
39+
clangAST
40+
clangBasic
41+
clangLex
3542
clangSema
3643
)

lib/StaticAnalyzer/Checkers/CMakeLists.txt

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ clang_tablegen(Checkers.inc -gen-clang-sa-checkers
33
SOURCE Checkers.td
44
TARGET ClangSACheckers)
55

6+
set(LLVM_LINK_COMPONENTS
7+
Support
8+
)
9+
610
add_clang_library(clangStaticAnalyzerCheckers
711
AllocationDiagnostics.cpp
812
AnalyzerStatsChecker.cpp
@@ -85,7 +89,8 @@ add_dependencies(clangStaticAnalyzerCheckers
8589
)
8690

8791
target_link_libraries(clangStaticAnalyzerCheckers
88-
clangBasic
8992
clangAST
93+
clangAnalysis
94+
clangBasic
9095
clangStaticAnalyzerCore
9196
)

lib/StaticAnalyzer/Core/CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ add_dependencies(clangStaticAnalyzerCore
5151
)
5252

5353
target_link_libraries(clangStaticAnalyzerCore
54-
clangBasic
55-
clangLex
5654
clangAST
55+
clangAnalysis
56+
clangBasic
5757
clangFrontend
58+
clangLex
5859
clangRewriteCore
5960
)

lib/StaticAnalyzer/Frontend/CMakeLists.txt

+8-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ set(LLVM_NO_RTTI 1)
22

33
include_directories( ${CMAKE_CURRENT_BINARY_DIR}/../Checkers )
44

5+
set(LLVM_LINK_COMPONENTS
6+
Support
7+
)
8+
59
add_clang_library(clangStaticAnalyzerFrontend
610
AnalysisConsumer.cpp
711
CheckerRegistration.cpp
@@ -21,11 +25,13 @@ add_dependencies(clangStaticAnalyzerFrontend
2125
)
2226

2327
target_link_libraries(clangStaticAnalyzerFrontend
24-
clangBasic
25-
clangLex
2628
clangAST
29+
clangAnalysis
30+
clangBasic
2731
clangFrontend
32+
clangLex
2833
clangRewriteCore
2934
clangRewriteFrontend
3035
clangStaticAnalyzerCheckers
36+
clangStaticAnalyzerCore
3137
)

lib/Tooling/CMakeLists.txt

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ add_dependencies(clangTooling
2121
)
2222

2323
target_link_libraries(clangTooling
24-
clangBasic
25-
clangFrontend
2624
clangAST
2725
clangASTMatchers
26+
clangBasic
27+
clangDriver
28+
clangFrontend
29+
clangLex
2830
clangRewriteCore
2931
clangRewriteFrontend
3032
)

0 commit comments

Comments
 (0)