Skip to content

Commit dd85d79

Browse files
compnerdcompnerd
committed
tools: use target_link_libraries like clang (NFC)
Rather than using the `LINK_LIBRARIES` option, use target_link_libraries like clang does. Because these are all host tools, there is no name mangling done for the libraries making this a no-op change.
1 parent d8f1917 commit dd85d79

File tree

16 files changed

+94
-73
lines changed

16 files changed

+94
-73
lines changed

‎tools/driver/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ add_swift_host_tool(swift
44
autolink_extract_main.cpp
55
modulewrap_main.cpp
66
swift_format_main.cpp
7-
LINK_LIBRARIES
8-
swiftDriver
9-
swiftFrontendTool
107
SWIFT_COMPONENT compiler
118
)
12-
9+
target_link_libraries(swift
10+
PRIVATE
11+
swiftDriver
12+
swiftFrontendTool)
1313
if(HAVE_UNICODE_LIBEDIT)
1414
target_link_libraries(swift PRIVATE edit)
1515
endif()

‎tools/lldb-moduleimport-test/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
add_swift_host_tool(lldb-moduleimport-test
22
lldb-moduleimport-test.cpp
3-
LINK_LIBRARIES
4-
swiftASTSectionImporter swiftFrontend swiftClangImporter
53
SWIFT_COMPONENT tools
64
)
5+
target_link_libraries(lldb-moduleimport-test
6+
PRIVATE
7+
swiftASTSectionImporter
8+
swiftClangImporter
9+
swiftFrontend)
710

‎tools/sil-func-extractor/CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
add_swift_host_tool(sil-func-extractor
22
SILFunctionExtractor.cpp
3-
LINK_LIBRARIES
4-
swiftFrontend
5-
swiftSILGen
6-
swiftSILOptimizer
7-
swiftSerialization
8-
swiftClangImporter
93
SWIFT_COMPONENT tools
104
)
5+
target_link_libraries(sil-func-extractor
6+
PRIVATE
7+
swiftClangImporter
8+
swiftFrontend
9+
swiftSerialization
10+
swiftSILGen
11+
swiftSILOptimizer)

‎tools/sil-llvm-gen/CMakeLists.txt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
add_swift_host_tool(sil-llvm-gen
22
SILLLVMGen.cpp
3-
LINK_LIBRARIES
4-
swiftFrontend
5-
swiftIRGen
6-
swiftSILGen
7-
swiftSILOptimizer
8-
# Clang libraries included to appease the linker on linux.
9-
clangBasic
10-
clangCodeGen
113
SWIFT_COMPONENT tools
124
)
5+
target_link_libraries(sil-llvm-gen
6+
PRIVATE
7+
swiftFrontend
8+
swiftIRGen
9+
swiftSILGen
10+
swiftSILOptimizer
11+
# Clang libraries included to appease the linker on linux.
12+
clangBasic
13+
clangCodeGen)

‎tools/sil-nm/CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
add_swift_host_tool(sil-nm
22
SILNM.cpp
3-
LINK_LIBRARIES
4-
swiftFrontend
5-
swiftSILGen
6-
swiftSILOptimizer
7-
swiftSerialization
8-
swiftClangImporter
93
SWIFT_COMPONENT tools
104
)
5+
target_link_libraries(sil-nm
6+
PRIVATE
7+
swiftClangImporter
8+
swiftFrontend
9+
swiftSerialization
10+
swiftSILGen
11+
swiftSILOptimizer)

‎tools/sil-opt/CMakeLists.txt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
add_swift_host_tool(sil-opt
22
SILOpt.cpp
3-
LINK_LIBRARIES
4-
swiftFrontend
5-
swiftIRGen
6-
swiftSILGen
7-
swiftSILOptimizer
8-
# Clang libraries included to appease the linker on linux.
9-
clangBasic
10-
clangCodeGen
113
SWIFT_COMPONENT tools
124
)
5+
target_link_libraries(sil-opt
6+
PRIVATE
7+
swiftFrontend
8+
swiftIRGen
9+
swiftSILGen
10+
swiftSILOptimizer
11+
# Clang libraries included to appease the linker on linux.
12+
clangBasic
13+
clangCodeGen)

‎tools/sil-passpipeline-dumper/CMakeLists.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
add_swift_host_tool(sil-passpipeline-dumper
22
SILPassPipelineDumper.cpp
3-
LINK_LIBRARIES
4-
swiftFrontend
5-
swiftSILGen
6-
swiftSILOptimizer
7-
swiftSerialization
8-
swiftClangImporter
9-
# FIXME: Circular dependencies require re-listing these libraries.
10-
swiftSema
11-
swiftAST
123
SWIFT_COMPONENT tools
134
)
5+
target_link_libraries(sil-passpipeline-dumper
6+
PRIVATE
7+
swiftClangImporter
8+
swiftFrontend
9+
swiftSerialization
10+
swiftSILGen
11+
swiftSILOptimizer
12+
# FIXME: Circular dependencies require re-listing these libraries.
13+
swiftAST
14+
swiftSema)

‎tools/swift-api-digester/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ add_swift_host_tool(swift-api-digester
22
swift-api-digester.cpp
33
ModuleAnalyzerNodes.cpp
44
ModuleDiagsConsumer.cpp
5-
LINK_LIBRARIES swiftFrontend swiftIDE
65
SWIFT_COMPONENT tools
76
)
7+
target_link_libraries(swift-api-digester
8+
PRIVATE
9+
swiftFrontend
10+
swiftIDE)

‎tools/swift-demangle-fuzzer/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
add_swift_fuzzer_host_tool(swift-demangle-fuzzer
22
swift-demangle-fuzzer.cpp
3-
LINK_LIBRARIES swiftDemangling
43
LLVM_COMPONENT_DEPENDS support
54
SWIFT_COMPONENT compiler
65
)
6+
target_link_libraries(swift-demangle-fuzzer
7+
PRIVATE
8+
swiftDemangling)

‎tools/swift-demangle-yamldump/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
add_swift_host_tool(swift-demangle-yamldump
22
swift-demangle-yamldump.cpp
3-
LINK_LIBRARIES swiftDemangling
43
LLVM_COMPONENT_DEPENDS support
54
SWIFT_COMPONENT tools
65
)
6+
target_link_libraries(swift-demangle-yamldump
7+
PRIVATE
8+
swiftDemangling)

‎tools/swift-demangle/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
add_swift_host_tool(swift-demangle
22
swift-demangle.cpp
3-
LINK_LIBRARIES swiftDemangling
43
LLVM_COMPONENT_DEPENDS support
54
SWIFT_COMPONENT compiler
65
)
6+
target_link_libraries(swift-demangle
7+
PRIVATE
8+
swiftDemangling)

‎tools/swift-ide-test/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ add_swift_host_tool(swift-ide-test
22
swift-ide-test.cpp
33
ModuleAPIDiff.cpp
44
XMLValidator.cpp
5-
LINK_LIBRARIES
6-
swiftDriver
7-
swiftFrontend
8-
swiftIDE
95
SWIFT_COMPONENT tools
106
)
7+
target_link_libraries(swift-ide-test
8+
PRIVATE
9+
swiftDriver
10+
swiftFrontend
11+
swiftIDE)
1112

1213
# If libxml2 is available, make it available for swift-ide-test.
1314
if(SWIFT_HAVE_LIBXML)

‎tools/swift-llvm-opt/CMakeLists.txt

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
add_swift_host_tool(swift-llvm-opt
22
LLVMOpt.cpp
3-
LINK_LIBRARIES
4-
swiftIRGen
5-
6-
# Swift libraries included to appease the linker on linux.
7-
swiftSema
8-
swiftAST
9-
10-
# Clang libraries included to appease the linker on linux.
11-
clangBasic
12-
clangCodeGen
13-
143
SWIFT_COMPONENT tools
154
)
5+
target_link_libraries(swift-llvm-opt
6+
PRIVATE
7+
swiftIRGen
8+
# Swift libraries included to appease the linker on linux.
9+
swiftSema
10+
swiftAST
11+
# Clang libraries included to appease the linker on linux.
12+
clangBasic
13+
clangCodeGen)

‎tools/swift-refactor/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
add_swift_host_tool(swift-refactor
22
swift-refactor.cpp
3-
LINK_LIBRARIES swiftDriver swiftFrontend swiftIDE
43
SWIFT_COMPONENT tools
54
)
5+
target_link_libraries(swift-refactor
6+
PRIVATE
7+
swiftDriver
8+
swiftFrontend
9+
swiftIDE)

‎tools/swift-remoteast-test/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
add_swift_host_tool(swift-remoteast-test
22
swift-remoteast-test.cpp
3-
LINK_LIBRARIES
4-
swiftFrontendTool
5-
swiftRemoteAST
63
SWIFT_COMPONENT tools
74
)
8-
5+
target_link_libraries(swift-remoteast-test
6+
PRIVATE
7+
swiftFrontendTool
8+
swiftRemoteAST)
99
set_target_properties(swift-remoteast-test PROPERTIES ENABLE_EXPORTS 1)
1010
if(HAVE_UNICODE_LIBEDIT)
1111
target_link_libraries(swift-remoteast-test PRIVATE edit)

‎tools/swift-syntax-test/CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
add_swift_host_tool(swift-syntax-test
22
swift-syntax-test.cpp
3-
LINK_LIBRARIES
4-
swiftAST
5-
swiftDriver
6-
swiftFrontend
7-
swiftSema
8-
swiftSyntax
93
LLVM_COMPONENT_DEPENDS
104
Support
115
SWIFT_COMPONENT tools
126
)
7+
target_link_libraries(swift-syntax-test
8+
PRIVATE
9+
swiftAST
10+
swiftDriver
11+
swiftFrontend
12+
swiftSema
13+
swiftSyntax)

0 commit comments

Comments
 (0)