cmake: simplify Swift module dependency for Swift host tools. NFC (swiftlang#18600)

Author: nkcsgexi

cmake/modules/AddSwift.cmake

@@ -2314,13 +2314,28 @@ macro(add_swift_lib_subdirectory name)
 endmacro()
 
 function(add_swift_host_tool executable)
+  set(ADDSWIFTHOSTTOOL_multiple_parameter_options
+        SWIFT_COMPONENT
+        COMPILE_FLAGS
+        DEPENDS
+        SWIFT_MODULE_DEPENDS)
+
   cmake_parse_arguments(
       ADDSWIFTHOSTTOOL # prefix
       "" # options
       "" # single-value args
-      "SWIFT_COMPONENT;COMPILE_FLAGS;DEPENDS" # multi-value args
+      "${ADDSWIFTHOSTTOOL_multiple_parameter_options}" # multi-value args
       ${ARGN})
 
+  # Configure variables for this subdirectory.
+  set(VARIANT_SUFFIX "-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH}")
+  set(MODULE_VARIANT_SUFFIX "-swiftmodule${VARIANT_SUFFIX}")
+
+  foreach(mod ${ADDSWIFTHOSTTOOL_SWIFT_MODULE_DEPENDS})
+    list(APPEND ADDSWIFTHOSTTOOL_DEPENDS "swift${mod}${MODULE_VARIANT_SUFFIX}")
+    list(APPEND ADDSWIFTHOSTTOOL_DEPENDS "swift${mod}${VARIANT_SUFFIX}")
+  endforeach()
+
   # Create the executable rule.
   add_swift_executable(
     ${executable} 

tools/swift-swiftsyntax-test/CMakeLists.txt

@@ -1,16 +1,7 @@
-macro(add_swift_module_depends results target)
-  list(APPEND ${results} "${target}-macosx")
-  list(APPEND ${results} "${target}-macosx-x86_64")
-  list(APPEND ${results} "${target}-swiftmodule-macosx-x86_64")
-endmacro()
-
-add_swift_module_depends(all_depends swiftTestUtils)
-add_swift_module_depends(all_depends swiftSwiftSyntax)
-
 add_swift_host_tool(swift-swiftsyntax-test
   main.swift
   ClassifiedSyntaxTreePrinter.swift
   empty.c # FIXME: If there is no C file in the target Xcode skips the linking phase and doesn't create the executable
   COMPILE_FLAGS "-module-name" "main"
-  DEPENDS ${all_depends}
+  SWIFT_MODULE_DEPENDS TestUtils SwiftSyntax
 )