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

Commit 560a921

Browse files
BigcheeseBigcheese
committed
Revert "CMake: Update to use standard CMake dependency tracking facilities instead"
This reverts commit r113631 Conflicts: CMakeLists.txt lib/CodeGen/CMakeLists.txt git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@113817 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 206caf5 commit 560a921

File tree

21 files changed

+165
-252
lines changed

21 files changed

+165
-252
lines changed

‎CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ macro(add_clang_library name)
107107
set_target_properties(${name} PROPERTIES COMPILE_FLAGS ${cflag})
108108
endif(MSVC)
109109
install(TARGETS ${name}
110-
EXPORT LLVM
111110
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
112111
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
113112
endmacro(add_clang_library)

‎examples/PrintFunctionNames/CMakeLists.txt

+1-10
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,7 @@ set(MODULE TRUE)
22

33
set(LLVM_NO_RTTI 1)
44

5-
add_clang_library(PrintFunctionNames
6-
PrintFunctionNames.cpp
7-
)
8-
9-
target_link_libraries(PrintFunctionNames
10-
clangAST
11-
clangFrontend
12-
clangBasic
13-
)
14-
5+
add_clang_library(PrintFunctionNames PrintFunctionNames.cpp)
156

167
set_target_properties(PrintFunctionNames
178
PROPERTIES

‎examples/clang-interpreter/CMakeLists.txt

+28-18
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,34 @@
11
set(LLVM_NO_RTTI 1)
22

3-
add_clang_executable(clang-interpreter
4-
main.cpp
5-
)
3+
set(LLVM_USED_LIBS
4+
clangFrontend
5+
clangSerialization
6+
clangDriver
7+
clangCodeGen
8+
clangSema
9+
clangChecker
10+
clangIndex
11+
clangAnalysis
12+
clangRewrite
13+
clangAST
14+
clangParse
15+
clangLex
16+
clangBasic
17+
)
618

7-
add_llvm_link_components(clang-interpreter jit interpreter nativecodegen)
8-
target_link_libraries(clang-interpreter
9-
clangFrontend
10-
clangSerialization
11-
clangDriver
12-
clangCodeGen
13-
clangSema
14-
clangChecker
15-
clangIndex
16-
clangAnalysis
17-
clangRewrite
18-
clangAST
19-
clangParse
20-
clangLex
21-
clangBasic
19+
set(LLVM_LINK_COMPONENTS
20+
jit
21+
interpreter
22+
nativecodegen
23+
asmparser
24+
bitreader
25+
bitwriter
26+
codegen
27+
ipo
28+
selectiondag
2229
)
2330

31+
add_clang_executable(clang-interpreter
32+
main.cpp
33+
)
2434
add_dependencies(clang-interpreter clang-headers)

‎examples/wpa/CMakeLists.txt

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

3-
add_clang_executable(clang-wpa
4-
clang-wpa.cpp
5-
)
6-
7-
target_link_libraries(clang-wpa
3+
set(LLVM_USED_LIBS
84
clangIndex
95
clangFrontend
106
clangDriver
@@ -16,9 +12,15 @@ target_link_libraries(clang-wpa
1612
clangAST
1713
clangParse
1814
clangLex
19-
clangBasic
15+
clangBasic)
16+
17+
set( LLVM_LINK_COMPONENTS
18+
bitreader
19+
mc
20+
core
2021
)
2122

22-
add_dependencies(clang-wpa
23-
clang-headers
23+
add_clang_executable(clang-wpa
24+
clang-wpa.cpp
2425
)
26+
add_dependencies(clang-wpa clang-headers)

‎lib/AST/CMakeLists.txt

+4-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
set(LLVM_NO_RTTI 1)
22

3+
set(LLVM_USED_LIBS clangBasic)
4+
35
add_clang_library(clangAST
46
APValue.cpp
57
ASTConsumer.cpp
@@ -42,16 +44,5 @@ add_clang_library(clangAST
4244
TypePrinter.cpp
4345
)
4446

45-
target_link_libraries(clangAST
46-
clangBasic
47-
)
48-
49-
add_dependencies(clangAST
50-
ClangARMNeon
51-
ClangAttrClasses
52-
ClangAttrList
53-
ClangAttrImpl
54-
ClangDiagnosticAST
55-
ClangDeclNodes
56-
ClangStmtNodes
57-
)
47+
add_dependencies(clangAST ClangARMNeon ClangAttrClasses ClangAttrList
48+
ClangAttrImpl ClangDiagnosticAST ClangDeclNodes ClangStmtNodes)

‎lib/Analysis/CMakeLists.txt

+4-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
set(LLVM_NO_RTTI 1)
22

3+
set(LLVM_USED_LIBS clangBasic clangAST clangIndex)
4+
35
add_clang_library(clangAnalysis
46
AnalysisContext.cpp
57
CFG.cpp
@@ -13,16 +15,5 @@ add_clang_library(clangAnalysis
1315
UninitializedValues.cpp
1416
)
1517

16-
target_link_libraries(clangAnalysis
17-
clangBasic
18-
clangAST
19-
clangIndex
20-
)
21-
22-
add_dependencies(clangAnalysis
23-
ClangAttrClasses
24-
ClangAttrList
25-
ClangDiagnosticAnalysis
26-
ClangDeclNodes
27-
ClangStmtNodes
28-
)
18+
add_dependencies(clangAnalysis ClangAttrClasses ClangAttrList
19+
ClangDiagnosticAnalysis ClangDeclNodes ClangStmtNodes)

‎lib/Basic/CMakeLists.txt

+13-18
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ add_clang_library(clangBasic
1414
Version.cpp
1515
)
1616

17-
target_link_libraries(clangBasic
18-
LLVMMC
19-
)
20-
2117
# Determine Subversion revision.
2218
# FIXME: This only gets updated when CMake is run, so this revision number
2319
# may be out-of-date!
@@ -28,17 +24,16 @@ if (Subversion_FOUND AND EXISTS "${CLANG_SOURCE_DIR}/.svn")
2824
PROPERTIES COMPILE_DEFINITIONS "SVN_REVISION=\"${CLANG_WC_REVISION}\"")
2925
endif()
3026

31-
add_dependencies(clangBasic
32-
ClangARMNeon
33-
ClangAttrList
34-
ClangDiagnosticAnalysis
35-
ClangDiagnosticAST
36-
ClangDiagnosticCommon
37-
ClangDiagnosticDriver
38-
ClangDiagnosticFrontend
39-
ClangDiagnosticGroups
40-
ClangDiagnosticLex
41-
ClangDiagnosticParse
42-
ClangDiagnosticSema
43-
)
44-
27+
add_dependencies(clangBasic
28+
ClangARMNeon
29+
ClangAttrList
30+
ClangDiagnosticAnalysis
31+
ClangDiagnosticAST
32+
ClangDiagnosticCommon
33+
ClangDiagnosticDriver
34+
ClangDiagnosticFrontend
35+
ClangDiagnosticGroups
36+
ClangDiagnosticLex
37+
ClangDiagnosticParse
38+
ClangDiagnosticSema)
39+

‎lib/Checker/CMakeLists.txt

+4-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
set(LLVM_NO_RTTI 1)
22

3+
set(LLVM_USED_LIBS clangBasic clangLex clangAST clangFrontend clangRewrite)
4+
35
add_clang_library(clangChecker
46
AdjustedReturnValueChecker.cpp
57
AggExprVisitor.cpp
@@ -82,17 +84,5 @@ add_clang_library(clangChecker
8284
ValueManager.cpp
8385
)
8486

85-
target_link_libraries(clangChecker
86-
clangBasic
87-
clangLex
88-
clangAST
89-
clangFrontend
90-
clangRewrite
91-
)
92-
93-
add_dependencies(clangChecker
94-
ClangAttrClasses
95-
ClangAttrList
96-
ClangDeclNodes
97-
ClangStmtNodes
98-
)
87+
add_dependencies(clangChecker ClangAttrClasses ClangAttrList ClangDeclNodes
88+
ClangStmtNodes)

‎lib/CodeGen/CMakeLists.txt

+4-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
set(LLVM_NO_RTTI 1)
22

3+
set(LLVM_USED_LIBS clangBasic clangAST clangFrontend)
4+
35
add_clang_library(clangCodeGen
46
BackendUtil.cpp
57
CGBlocks.cpp
@@ -37,19 +39,5 @@ add_clang_library(clangCodeGen
3739
TargetInfo.cpp
3840
)
3941

40-
target_link_libraries(clangCodeGen
41-
LLVMCore
42-
LLVMAsmParser
43-
LLVMBitReader
44-
LLVMBitWriter
45-
LLVMipo
46-
)
47-
48-
add_dependencies(clangCodeGen
49-
ClangARMNeon
50-
ClangAttrClasses
51-
ClangAttrList
52-
ClangDeclNodes
53-
ClangStmtNodes
54-
ClangDiagnosticFrontend
55-
)
42+
add_dependencies(clangCodeGen ClangAttrClasses ClangAttrList ClangDeclNodes
43+
ClangStmtNodes)

‎lib/Driver/CMakeLists.txt

+4-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
set(LLVM_NO_RTTI 1)
22

3+
set(LLVM_USED_LIBS clangBasic clangAST clangParse)
4+
35
add_clang_library(clangDriver
46
Action.cpp
57
Arg.cpp
@@ -21,16 +23,5 @@ add_clang_library(clangDriver
2123
Types.cpp
2224
)
2325

24-
target_link_libraries(clangDriver
25-
clangBasic
26-
clangAST
27-
clangParse
28-
)
29-
30-
add_dependencies(clangDriver
31-
ClangAttrList
32-
ClangDiagnosticDriver
33-
ClangDriverOptions
34-
ClangCC1Options
35-
ClangCC1AsOptions
36-
)
26+
add_dependencies(clangDriver ClangAttrList ClangDiagnosticDriver
27+
ClangDriverOptions ClangCC1Options ClangCC1AsOptions)

‎lib/Frontend/CMakeLists.txt

+12-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
set(LLVM_NO_RTTI 1)
22

3+
set( LLVM_USED_LIBS
4+
clangDriver
5+
clangParse
6+
clangSema
7+
clangAST
8+
clangLex
9+
clangBasic
10+
)
11+
312
add_clang_library(clangFrontend
413
ASTConsumers.cpp
514
ASTMerge.cpp
@@ -27,17 +36,6 @@ add_clang_library(clangFrontend
2736
Warnings.cpp
2837
)
2938

30-
target_link_libraries(clangFrontend
31-
LLVMCore
32-
33-
clangDriver
34-
clangParse
35-
clangSema
36-
clangAST
37-
clangLex
38-
clangBasic
39-
)
40-
4139
IF(MSVC)
4240
get_target_property(NON_ANSI_COMPILE_FLAGS clangFrontend COMPILE_FLAGS)
4341
string(REPLACE /Za
@@ -46,13 +44,12 @@ IF(MSVC)
4644
set_target_properties(clangFrontend PROPERTIES COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
4745
ENDIF(MSVC)
4846

49-
add_dependencies(clangFrontend
47+
add_dependencies(clangFrontend
5048
ClangAttrClasses
5149
ClangAttrList
5250
ClangCC1Options
53-
ClangDiagnosticFrontend
51+
ClangDiagnosticFrontend
5452
ClangDiagnosticLex
5553
ClangDiagnosticSema
5654
ClangDeclNodes
57-
ClangStmtNodes
58-
)
55+
ClangStmtNodes)

‎lib/FrontendTool/CMakeLists.txt

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
set(LLVM_NO_RTTI 1)
22

3+
set(LLVM_USED_LIBS clangDriver clangFrontend clangRewrite clangCodeGen
4+
clangChecker)
5+
36
add_clang_library(clangFrontendTool
47
ExecuteCompilerInvocation.cpp
58
)
6-
7-
target_link_libraries(clangFrontendTool
8-
clangDriver
9-
clangFrontend
10-
clangRewrite
11-
clangCodeGen
12-
clangChecker
13-
)

0 commit comments

Comments
 (0)