Merge pull request #30732 from allevato/update-deps

Add dependencies where targets depend on inclusions from unspecified targets.

Author: compnerd

lib/AST/CMakeLists.txt

@@ -116,25 +116,24 @@ if(NOT SWIFT_BUILD_ONLY_SYNTAXPARSERLIB)
     clangBasic)
 endif()
 
+target_link_libraries(swiftAST
+  PUBLIC swiftBasic
+  PRIVATE swiftSyntax)
 if(SWIFT_BUILD_ONLY_SYNTAXPARSERLIB)
   # Add clangBasic as a single direct dependency to avoid bringing along some
   # llvm libraries that we don't need.
   if("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "WINDOWS")
-    set(clangBasicDep "${LLVM_LIBRARY_OUTPUT_INTDIR}/clangBasic.lib")
+    target_link_libraries(swiftAST PRIVATE
+      "${LLVM_LIBRARY_OUTPUT_INTDIR}/clangBasic.lib")
   else()
-    set(clangBasicDep "${LLVM_LIBRARY_OUTPUT_INTDIR}/libclangBasic.a")
+    target_link_libraries(swiftAST PRIVATE
+      "${LLVM_LIBRARY_OUTPUT_INTDIR}/libclangBasic.a")
   endif()
-  target_link_libraries(swiftAST PRIVATE
-    swiftBasic
-    swiftSyntax
-    ${clangBasicDep})
   target_compile_definitions(swiftAST PRIVATE
     SWIFT_BUILD_ONLY_SYNTAXPARSERLIB=1)
 else()
   target_link_libraries(swiftAST PRIVATE
-    swiftBasic
-    swiftMarkup
-    swiftSyntax)
+    swiftMarkup)
 endif()
 
 # intrinsics_gen is the LLVM tablegen target that generates the include files

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}")

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

lib/LLVMPasses/CMakeLists.txt

@@ -9,4 +9,5 @@ add_swift_host_library(swiftLLVMPasses STATIC
   LLVM_LINK_COMPONENTS
   analysis
   )
-
+target_link_libraries(swiftLLVMPasses PRIVATE
+  swiftDemangling)

lib/ParseSIL/CMakeLists.txt

@@ -1,6 +1,7 @@
 add_swift_host_library(swiftParseSIL STATIC
   ParseSIL.cpp)
 target_link_libraries(swiftParseSIL PRIVATE
+  swiftDemangling
   swiftSema
   swiftSIL)
 

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)

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)

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)
 

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)

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