Skip to content
This repository was archived by the owner on Apr 23, 2020. It is now read-only.

Commit 2e6fcdf

Browse files
mgornymgorny
committed
[clang-tools-extra] [cmake] Link against libclang-cpp whenever possible
Use clang_target_link_libraries() in order to support linking against libclang-cpp instead of static libraries. Differential Revision: https://reviews.llvm.org/D68448 git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@373786 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent bc86507 commit 2e6fcdf

File tree

27 files changed

+120
-51
lines changed

27 files changed

+120
-51
lines changed

‎clang-apply-replacements/tool/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ set(LLVM_LINK_COMPONENTS
55
add_clang_tool(clang-apply-replacements
66
ClangApplyReplacementsMain.cpp
77
)
8-
target_link_libraries(clang-apply-replacements
8+
clang_target_link_libraries(clang-apply-replacements
99
PRIVATE
10-
clangApplyReplacements
1110
clangBasic
1211
clangFormat
1312
clangRewrite
1413
clangToolingCore
1514
clangToolingRefactoring
1615
)
16+
target_link_libraries(clang-apply-replacements
17+
PRIVATE
18+
clangApplyReplacements
19+
)

‎clang-change-namespace/tool/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,19 @@ set(LLVM_LINK_COMPONENTS
77
add_clang_tool(clang-change-namespace
88
ClangChangeNamespace.cpp
99
)
10-
target_link_libraries(clang-change-namespace
10+
clang_target_link_libraries(clang-change-namespace
1111
PRIVATE
1212
clangAST
1313
clangASTMatchers
1414
clangBasic
15-
clangChangeNamespace
1615
clangFormat
1716
clangFrontend
1817
clangRewrite
1918
clangSerialization
2019
clangTooling
2120
clangToolingCore
2221
)
22+
target_link_libraries(clang-change-namespace
23+
PRIVATE
24+
clangChangeNamespace
25+
)

‎clang-doc/tool/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,19 @@ add_clang_tool(clang-doc
44
ClangDocMain.cpp
55
)
66

7-
target_link_libraries(clang-doc
7+
clang_target_link_libraries(clang-doc
88
PRIVATE
99
clangAST
1010
clangASTMatchers
1111
clangBasic
1212
clangFrontend
13-
clangDoc
1413
clangTooling
1514
clangToolingCore
1615
)
16+
target_link_libraries(clang-doc
17+
PRIVATE
18+
clangDoc
19+
)
1720

1821
install(FILES ../assets/clang-doc-default-stylesheet.css
1922
DESTINATION share/clang

‎clang-include-fixer/find-all-symbols/tool/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ add_clang_tool(find-all-symbols
44
FindAllSymbolsMain.cpp
55
)
66

7-
target_link_libraries(find-all-symbols
7+
clang_target_link_libraries(find-all-symbols
88
PRIVATE
99
clangAST
1010
clangASTMatchers
@@ -13,6 +13,9 @@ target_link_libraries(find-all-symbols
1313
clangLex
1414
clangSerialization
1515
clangTooling
16+
)
17+
target_link_libraries(find-all-symbols
18+
PRIVATE
1619
findAllSymbols
1720
)
1821

‎clang-include-fixer/tool/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,19 @@ add_clang_tool(clang-include-fixer
44
ClangIncludeFixer.cpp
55
)
66

7-
target_link_libraries(clang-include-fixer
7+
clang_target_link_libraries(clang-include-fixer
88
PRIVATE
99
clangBasic
1010
clangFormat
1111
clangFrontend
12-
clangIncludeFixer
1312
clangRewrite
1413
clangSerialization
1514
clangTooling
1615
clangToolingCore
16+
)
17+
target_link_libraries(clang-include-fixer
18+
PRIVATE
19+
clangIncludeFixer
1720
findAllSymbols
1821
)
1922

‎clang-move/tool/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,19 @@ add_clang_tool(clang-move
44
ClangMove.cpp
55
)
66

7-
target_link_libraries(clang-move
7+
clang_target_link_libraries(clang-move
88
PRIVATE
99
clangAST
1010
clangASTMatchers
1111
clangBasic
1212
clangFormat
1313
clangFrontend
14-
clangMove
1514
clangRewrite
1615
clangSerialization
1716
clangTooling
1817
clangToolingCore
1918
)
19+
target_link_libraries(clang-move
20+
PRIVATE
21+
clangMove
22+
)

‎clang-query/tool/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
33
add_clang_tool(clang-query
44
ClangQuery.cpp
55
)
6-
target_link_libraries(clang-query
6+
clang_target_link_libraries(clang-query
77
PRIVATE
88
clangAST
99
clangASTMatchers
1010
clangBasic
1111
clangDynamicASTMatchers
1212
clangFrontend
13-
clangQuery
1413
clangSerialization
1514
clangTooling
1615
)
16+
target_link_libraries(clang-query
17+
PRIVATE
18+
clangQuery
19+
)

‎clang-reorder-fields/tool/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@ add_clang_tool(clang-reorder-fields
22
ClangReorderFields.cpp
33
)
44

5-
target_link_libraries(clang-reorder-fields
5+
clang_target_link_libraries(clang-reorder-fields
66
PRIVATE
77
clangBasic
88
clangFrontend
9-
clangReorderFields
109
clangRewrite
1110
clangSerialization
1211
clangTooling
1312
clangToolingCore
1413
)
14+
target_link_libraries(clang-reorder-fields
15+
PRIVATE
16+
clangReorderFields
17+
)

‎clang-tidy/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ add_clang_library(clangTidy
3131
)
3232

3333
if(CLANG_ENABLE_STATIC_ANALYZER)
34-
target_link_libraries(clangTidy PRIVATE
34+
clang_target_link_libraries(clangTidy PRIVATE
3535
clangStaticAnalyzerCore
3636
clangStaticAnalyzerFrontend
3737
)

‎clang-tidy/tool/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,17 @@ add_clang_tool(clang-tidy
1111
add_dependencies(clang-tidy
1212
clang-resource-headers
1313
)
14-
target_link_libraries(clang-tidy
14+
clang_target_link_libraries(clang-tidy
1515
PRIVATE
1616
clangAST
1717
clangASTMatchers
1818
clangBasic
19-
clangTidy
2019
clangTooling
2120
clangToolingCore
21+
)
22+
target_link_libraries(clang-tidy
23+
PRIVATE
24+
clangTidy
2225
${ALL_CLANG_TIDY_CHECKS}
2326
)
2427

‎clangd/fuzzer/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,16 @@ add_llvm_fuzzer(clangd-fuzzer
1212
DUMMY_MAIN DummyClangdMain.cpp
1313
)
1414

15-
target_link_libraries(clangd-fuzzer
15+
clang_target_link_libraries(clangd-fuzzer
1616
PRIVATE
1717
clangBasic
18-
clangDaemon
1918
clangFormat
2019
clangFrontend
2120
clangSema
2221
clangTooling
2322
clangToolingCore
2423
)
24+
target_link_libraries(clangd-fuzzer
25+
PRIVATE
26+
clangDaemon
27+
)

‎clangd/index/dex/dexp/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ add_clang_executable(dexp
99
Dexp.cpp
1010
)
1111

12-
target_link_libraries(dexp
12+
clang_target_link_libraries(dexp
1313
PRIVATE
1414
clangBasic
15+
)
16+
target_link_libraries(dexp
17+
PRIVATE
1518
clangDaemon
1619
)

‎clangd/indexer/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ add_clang_executable(clangd-indexer
88
IndexerMain.cpp
99
)
1010

11-
target_link_libraries(clangd-indexer
11+
clang_target_link_libraries(clangd-indexer
1212
PRIVATE
1313
clangAST
1414
clangBasic
15-
clangDaemon
1615
clangFrontend
1716
clangIndex
1817
clangLex
1918
clangTooling
2019
)
20+
target_link_libraries(clangd-indexer
21+
PRIVATE
22+
clangDaemon
23+
)

‎clangd/tool/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,21 @@ if(CLANGD_BUILD_XPC)
1515
list(APPEND CLANGD_XPC_LIBS "clangdXpcJsonConversions" "clangdXpcTransport")
1616
endif()
1717

18-
target_link_libraries(clangd
18+
clang_target_link_libraries(clangd
1919
PRIVATE
2020
clangAST
2121
clangBasic
22-
clangTidy
23-
clangDaemon
2422
clangFormat
2523
clangFrontend
2624
clangSema
2725
clangTooling
2826
clangToolingCore
2927
clangToolingRefactoring
3028
clangToolingSyntax
29+
)
30+
target_link_libraries(clangd
31+
PRIVATE
32+
clangTidy
33+
clangDaemon
3134
${CLANGD_XPC_LIBS}
3235
)

‎clangd/unittests/CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,23 +78,26 @@ add_unittest(ClangdUnitTests ClangdTests
7878
$<TARGET_OBJECTS:obj.clangDaemonTweaks>
7979
)
8080

81-
target_link_libraries(ClangdTests
81+
clang_target_link_libraries(ClangdTests
8282
PRIVATE
8383
clangAST
8484
clangBasic
85-
clangDaemon
8685
clangFormat
8786
clangFrontend
8887
clangIndex
8988
clangLex
9089
clangSema
9190
clangSerialization
92-
clangTidy
9391
clangTooling
9492
clangToolingCore
9593
clangToolingInclusions
9694
clangToolingRefactoring
9795
clangToolingSyntax
96+
)
97+
target_link_libraries(ClangdTests
98+
PRIVATE
99+
clangDaemon
100+
clangTidy
98101
LLVMSupport
99102
LLVMTestingSupport
100103
)

‎clangd/xpc/test-client/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@ set(LLVM_LINK_COMPONENTS
1313
support
1414
)
1515

16-
target_link_libraries(clangd-xpc-test-client
16+
clang_target_link_libraries(clangd-xpc-test-client
1717
PRIVATE
1818
clangBasic
19-
clangDaemon
2019
clangFormat
2120
clangFrontend
2221
clangSema
2322
clangTooling
2423
clangToolingCore
24+
)
25+
target_link_libraries(clangd-xpc-test-client
26+
PRIVATE
27+
clangDaemon
2528
clangdXpcJsonConversions
2629
)

‎modularize/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ add_clang_tool(modularize
1111
PreprocessorTracker.cpp
1212
)
1313

14-
target_link_libraries(modularize
14+
clang_target_link_libraries(modularize
1515
PRIVATE
1616
clangAST
1717
clangBasic

‎pp-trace/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ add_clang_tool(pp-trace
77
PPCallbacksTracker.cpp
88
)
99

10-
target_link_libraries(pp-trace
10+
clang_target_link_libraries(pp-trace
1111
PRIVATE
1212
clangAST
1313
clangBasic

‎tool-template/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ add_clang_executable(tool-template
66
ToolTemplate.cpp
77
)
88

9-
target_link_libraries(tool-template
9+
clang_target_link_libraries(tool-template
1010
PRIVATE
1111
clangAST
1212
clangASTMatchers

‎unittests/clang-apply-replacements/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@ add_extra_unittest(ClangApplyReplacementsTests
1111
ApplyReplacementsTest.cpp
1212
)
1313

14-
target_link_libraries(ClangApplyReplacementsTests
14+
clang_target_link_libraries(ClangApplyReplacementsTests
1515
PRIVATE
16-
clangApplyReplacements
1716
clangBasic
1817
clangToolingCore
1918
clangToolingRefactoring
2019
)
20+
target_link_libraries(ClangApplyReplacementsTests
21+
PRIVATE
22+
clangApplyReplacements
23+
)

‎unittests/clang-change-namespace/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,19 @@ add_extra_unittest(ClangChangeNamespaceTests
1515
ChangeNamespaceTests.cpp
1616
)
1717

18-
target_link_libraries(ClangChangeNamespaceTests
18+
clang_target_link_libraries(ClangChangeNamespaceTests
1919
PRIVATE
2020
clangAST
2121
clangASTMatchers
2222
clangBasic
23-
clangChangeNamespace
2423
clangFormat
2524
clangFrontend
2625
clangRewrite
2726
clangSerialization
2827
clangTooling
2928
clangToolingCore
3029
)
30+
target_link_libraries(ClangChangeNamespaceTests
31+
PRIVATE
32+
clangChangeNamespace
33+
)

0 commit comments

Comments
 (0)