[CMake] Sink add_pure_swift_host_library call into actual source dirs

Instead of doing everything in lib/ASTGen/CMakeLists.txt

Author: rintaro

lib/ASTGen/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(ASTGen_Swift_dependencies)
+add_subdirectory(Sources)
 
 # If requested, build the regular expression parser into the compiler itself.
 if(SWIFT_BUILD_REGEX_PARSER_IN_COMPILER)
@@ -14,69 +14,7 @@ if(SWIFT_BUILD_REGEX_PARSER_IN_COMPILER)
   add_pure_swift_host_library(_CompilerRegexParser STATIC
     "${COMPILER_REGEX_PARSER_SOURCES}"
   )
-
-  list(APPEND ASTGen_Swift_dependencies _CompilerRegexParser)
+else()
+  # Dummy target for dependencies
+  add_custom_target(_CompilerRegexParser)
 endif()
-
-add_pure_swift_host_library(swiftASTGen STATIC CXX_INTEROP
-  Sources/ASTGen/ASTGen.swift
-  Sources/ASTGen/ASTGen+CompilerBuildConfiguration.swift
-  Sources/ASTGen/Bridge.swift
-  Sources/ASTGen/CompilerBuildConfiguration.swift
-  Sources/ASTGen/DeclAttrs.swift
-  Sources/ASTGen/Decls.swift
-  Sources/ASTGen/Diagnostics.swift
-  Sources/ASTGen/DiagnosticsBridge.swift
-  Sources/ASTGen/Exprs.swift
-  Sources/ASTGen/Generics.swift
-  Sources/ASTGen/LegacyParse.swift
-  Sources/ASTGen/Literals.swift
-  Sources/ASTGen/ParameterClause.swift
-  Sources/ASTGen/Patterns.swift
-  Sources/ASTGen/Regex.swift
-  Sources/ASTGen/SourceFile.swift
-  Sources/ASTGen/Stmts.swift
-  Sources/ASTGen/TypeAttrs.swift
-  Sources/ASTGen/Types.swift
-
-  DEPENDENCIES
-    swiftAST
-  SWIFT_DEPENDENCIES
-    _CompilerSwiftSyntax
-    _CompilerSwiftIfConfig
-    _CompilerSwiftOperators
-    _CompilerSwiftSyntaxBuilder
-    _CompilerSwiftParser
-    _CompilerSwiftParserDiagnostics
-    _CompilerSwiftDiagnostics
-    ${ASTGen_Swift_dependencies}
-)
-
-add_pure_swift_host_library(swiftMacros STATIC CXX_INTEROP
-  Sources/Macros/Macros.swift
-  Sources/Macros/PluginHost.swift
-  Sources/Macros/SourceManager.swift
-
-  DEPENDENCIES
-    swiftAST
-  SWIFT_DEPENDENCIES
-    _CompilerSwiftCompilerPluginMessageHandling
-    _CompilerSwiftDiagnostics
-    _CompilerSwiftOperators
-    _CompilerSwiftParser
-    _CompilerSwiftSyntax
-    _CompilerSwiftSyntaxMacroExpansion
-    swiftASTGen
-)
-
-add_pure_swift_host_library(swiftIDEUtilsBridging CXX_INTEROP
-  Sources/SwiftIDEUtilsBridging/NameMatcherBridging.swift
-  
-  DEPENDENCIES
-    swiftAST
-  SWIFT_DEPENDENCIES
-    _CompilerSwiftIDEUtils
-    _CompilerSwiftSyntax
-    _CompilerSwiftIDEUtils
-    swiftASTGen
-)

lib/ASTGen/Sources/ASTGen/CMakeLists.txt

@@ -0,0 +1,33 @@
+add_pure_swift_host_library(swiftASTGen STATIC CXX_INTEROP
+  ASTGen.swift
+  ASTGen+CompilerBuildConfiguration.swift
+  Bridge.swift
+  CompilerBuildConfiguration.swift
+  DeclAttrs.swift
+  Decls.swift
+  Diagnostics.swift
+  DiagnosticsBridge.swift
+  Exprs.swift
+  Generics.swift
+  LegacyParse.swift
+  Literals.swift
+  ParameterClause.swift
+  Patterns.swift
+  Regex.swift
+  SourceFile.swift
+  Stmts.swift
+  TypeAttrs.swift
+  Types.swift
+
+  DEPENDENCIES
+    swiftAST
+  SWIFT_DEPENDENCIES
+    _CompilerRegexParser
+    _CompilerSwiftSyntax
+    _CompilerSwiftIfConfig
+    _CompilerSwiftOperators
+    _CompilerSwiftSyntaxBuilder
+    _CompilerSwiftParser
+    _CompilerSwiftParserDiagnostics
+    _CompilerSwiftDiagnostics
+)

lib/ASTGen/Sources/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_subdirectory(ASTGen)
+add_subdirectory(Macros)
+add_subdirectory(SwiftIDEUtilsBridging)

lib/ASTGen/Sources/Macros/CMakeLists.txt

@@ -0,0 +1,16 @@
+add_pure_swift_host_library(swiftMacros STATIC CXX_INTEROP
+  Macros.swift
+  PluginHost.swift
+  SourceManager.swift
+
+  DEPENDENCIES
+    swiftAST
+  SWIFT_DEPENDENCIES
+    _CompilerSwiftCompilerPluginMessageHandling
+    _CompilerSwiftDiagnostics
+    _CompilerSwiftOperators
+    _CompilerSwiftParser
+    _CompilerSwiftSyntax
+    _CompilerSwiftSyntaxMacroExpansion
+    swiftASTGen
+)

lib/ASTGen/Sources/SwiftIDEUtilsBridging/CMakeLists.txt

@@ -0,0 +1,11 @@
+add_pure_swift_host_library(swiftIDEUtilsBridging CXX_INTEROP
+  NameMatcherBridging.swift
+
+  DEPENDENCIES
+    swiftAST
+  SWIFT_DEPENDENCIES
+    _CompilerSwiftIDEUtils
+    _CompilerSwiftSyntax
+    _CompilerSwiftIDEUtils
+    swiftASTGen
+)