Add dependencies where targets depend on inclusions from unspecified targets.

allevato · allevato · commit 5284cb6f9935 · 2020-03-31T09:19:41.000-07:00
A follow-up PR adds a flag to control an inline namespace that allows
symbols in libDemangling to be distinguished between the runtime and
the compiler. These dependencies ensure that the flag is plumbed
through for inclusions of Demangling headers that aren't already
covered by existing `target_link_libraries`.
diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt
@@ -124,15 +124,17 @@ if(SWIFT_BUILD_ONLY_SYNTAXPARSERLIB)
   else()
     set(clangBasicDep "${LLVM_LIBRARY_OUTPUT_INTDIR}/libclangBasic.a")
   endif()
+  target_link_libraries(swiftAST PUBLIC
+    swiftBasic)
   target_link_libraries(swiftAST PRIVATE
-    swiftBasic
     swiftSyntax
     ${clangBasicDep})
   target_compile_definitions(swiftAST PRIVATE
     SWIFT_BUILD_ONLY_SYNTAXPARSERLIB=1)
 else()
+  target_link_libraries(swiftAST PUBLIC
+    swiftBasic)
   target_link_libraries(swiftAST PRIVATE
-    swiftBasic
     swiftMarkup
     swiftSyntax)
 endif()
diff --git a/lib/Basic/CMakeLists.txt b/lib/Basic/CMakeLists.txt
@@ -86,8 +86,9 @@ add_swift_host_library(swiftBasic STATIC
 target_include_directories(swiftBasic PRIVATE
   ${UUID_INCLUDE})
 
+target_link_libraries(swiftBasic PUBLIC
+  swiftDemangling)
 target_link_libraries(swiftBasic PRIVATE
-  swiftDemangling
   ${UUID_LIBRARIES})
 
 message(STATUS "Swift version: ${SWIFT_VERSION}")
diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt
@@ -16,6 +16,7 @@ add_swift_host_library(swiftFrontend STATIC
 add_dependencies(swiftFrontend
   SwiftOptions)
 target_link_libraries(swiftFrontend PRIVATE
+  swiftAST
   swiftSIL
   swiftMigrator
   swiftOption
diff --git a/lib/LLVMPasses/CMakeLists.txt b/lib/LLVMPasses/CMakeLists.txt
@@ -9,4 +9,5 @@ add_swift_host_library(swiftLLVMPasses STATIC
   LLVM_LINK_COMPONENTS
   analysis
   )
-
+target_link_libraries(swiftLLVMPasses PRIVATE
+  swiftDemangling)
diff --git a/lib/ParseSIL/CMakeLists.txt b/lib/ParseSIL/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_swift_host_library(swiftParseSIL STATIC
   ParseSIL.cpp)
 target_link_libraries(swiftParseSIL PRIVATE
+  swiftDemangling
   swiftSema
   swiftSIL)
 
diff --git a/lib/RemoteAST/CMakeLists.txt b/lib/RemoteAST/CMakeLists.txt
@@ -15,6 +15,8 @@ add_swift_host_library(swiftRemoteAST STATIC
   RemoteAST.cpp
   InProcessMemoryReader.cpp
   ${REMOTE_LIB_HEADERS})
+target_link_libraries(swiftRemoteAST PUBLIC
+  swiftDemangling)
 target_link_libraries(swiftRemoteAST PRIVATE
   swiftIRGen
   swiftSema)
diff --git a/lib/SIL/CMakeLists.txt b/lib/SIL/CMakeLists.txt
@@ -27,6 +27,8 @@ add_subdirectory(Verifier)
 
 add_swift_host_library(swiftSIL STATIC
   ${SIL_SOURCES})
+target_link_libraries(swiftSIL PUBLIC
+  swiftDemangling)
 target_link_libraries(swiftSIL PRIVATE
   swiftSema
   swiftSerialization)
diff --git a/tools/SourceKit/tools/sourcekitd/lib/API/CMakeLists.txt b/tools/SourceKit/tools/sourcekitd/lib/API/CMakeLists.txt
@@ -14,6 +14,7 @@ add_sourcekit_library(sourcekitdAPI
   ExpressionTypeArray.cpp
 )
 target_link_libraries(sourcekitdAPI PRIVATE
+  swiftBasic
   SourceKitSupport
   SourceKitSwiftLang)
 
diff --git a/tools/lldb-moduleimport-test/CMakeLists.txt b/tools/lldb-moduleimport-test/CMakeLists.txt
@@ -4,6 +4,7 @@ add_swift_host_tool(lldb-moduleimport-test
 )
 target_link_libraries(lldb-moduleimport-test
                       PRIVATE
+                        swiftAST
                         swiftASTSectionImporter
                         swiftClangImporter
                         swiftFrontend)
diff --git a/tools/sil-func-extractor/CMakeLists.txt b/tools/sil-func-extractor/CMakeLists.txt
@@ -5,6 +5,7 @@ add_swift_host_tool(sil-func-extractor
 target_link_libraries(sil-func-extractor
                       PRIVATE
                         swiftClangImporter
+                        swiftDemangling
                         swiftFrontend
                         swiftSerialization
                         swiftSILGen
diff --git a/tools/sil-nm/CMakeLists.txt b/tools/sil-nm/CMakeLists.txt
@@ -5,6 +5,7 @@ add_swift_host_tool(sil-nm
 target_link_libraries(sil-nm
                       PRIVATE
                         swiftClangImporter
+                        swiftDemangling
                         swiftFrontend
                         swiftSerialization
                         swiftSILGen
diff --git a/tools/sil-opt/CMakeLists.txt b/tools/sil-opt/CMakeLists.txt
@@ -6,6 +6,7 @@ target_link_libraries(sil-opt
                       PRIVATE
                         swiftFrontend
                         swiftIRGen
+                        swiftSIL
                         swiftSILGen
                         swiftSILOptimizer
                         # Clang libraries included to appease the linker on linux.
diff --git a/tools/swift-ast-script/CMakeLists.txt b/tools/swift-ast-script/CMakeLists.txt
@@ -7,4 +7,5 @@ add_swift_host_tool(swift-ast-script
 )
 target_link_libraries(swift-ast-script
                       PRIVATE
+                        swiftAST
                         swiftFrontendTool)
diff --git a/tools/swift-ide-test/CMakeLists.txt b/tools/swift-ide-test/CMakeLists.txt
@@ -6,6 +6,7 @@ add_swift_host_tool(swift-ide-test
 )
 target_link_libraries(swift-ide-test
                       PRIVATE
+                        swiftAST
                         swiftDriver
                         swiftFrontend
                         swiftIDE)

Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,5 @@ add_swift_host_library(swiftLLVMPasses STATIC`
`9`	`9`	`LLVM_LINK_COMPONENTS`
`10`	`10`	`analysis`
`11`	`11`	`)`
`12`		`-`
	`12`	`+target_link_libraries(swiftLLVMPasses PRIVATE`
	`13`	`+ swiftDemangling)`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ add_sourcekit_library(sourcekitdAPI`
`14`	`14`	`ExpressionTypeArray.cpp`
`15`	`15`	`)`
`16`	`16`	`target_link_libraries(sourcekitdAPI PRIVATE`
	`17`	`+ swiftBasic`
`17`	`18`	`SourceKitSupport`
`18`	`19`	`SourceKitSwiftLang)`
`19`	`20`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ add_swift_host_tool(lldb-moduleimport-test`
`4`	`4`	`)`
`5`	`5`	`target_link_libraries(lldb-moduleimport-test`
`6`	`6`	`PRIVATE`
	`7`	`+ swiftAST`
`7`	`8`	`swiftASTSectionImporter`
`8`	`9`	`swiftClangImporter`
`9`	`10`	`swiftFrontend)`
Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,5 @@ add_swift_host_tool(swift-ast-script`
`7`	`7`	`)`
`8`	`8`	`target_link_libraries(swift-ast-script`
`9`	`9`	`PRIVATE`
	`10`	`+ swiftAST`
`10`	`11`	`swiftFrontendTool)`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ add_swift_host_tool(swift-ide-test`
`6`	`6`	`)`
`7`	`7`	`target_link_libraries(swift-ide-test`
`8`	`8`	`PRIVATE`
	`9`	`+ swiftAST`
`9`	`10`	`swiftDriver`
`10`	`11`	`swiftFrontend`
`11`	`12`	`swiftIDE)`