[CMake] Clean up (somewhat) the generated Xcode project (#20586)

Still to do: have command-only targets that present sources, for things
like copy_shim_headers.

Author: jrose-apple

include/swift/Syntax/CMakeLists.txt

@@ -15,3 +15,5 @@ set(generated_include_sources
 
 add_gyb_target(swift-syntax-generated-headers
     "${generated_include_sources}")
+set_property(TARGET swift-syntax-generated-headers
+    PROPERTY FOLDER "Miscellaneous")

stdlib/public/Platform/CMakeLists.txt

@@ -121,3 +121,4 @@ foreach(sdk ${SWIFT_SDKS})
   endforeach()
 endforeach()
 add_custom_target(glibc_modulemap DEPENDS ${glibc_modulemap_target_list})
+set_property(TARGET glibc_modulemap PROPERTY FOLDER "Miscellaneous")

test/CMakeLists.txt

@@ -334,7 +334,10 @@ foreach(SDK ${SWIFT_SDKS})
             DEPENDS ${dependencies}
             COMMENT "Running ${test_subset} Swift tests for ${VARIANT_TRIPLE} from custom test locations"
             USES_TERMINAL)
-        set_property(TARGET "${test_target_name}" "${test_target_name}-custom"
+        set_property(TARGET
+            "${test_target_name}"
+            "${test_target_name}-custom"
+            "${test_dependencies_target_name}"
             PROPERTY FOLDER "Tests/check-swift")
       endforeach()
     endforeach()
@@ -360,7 +363,11 @@ foreach(test_mode ${TEST_MODES})
     set_property(TARGET "${test_target_name}"
         PROPERTY FOLDER "Tests/check-swift")
 
-    add_custom_target("swift${test_subset_target_suffix}${test_mode_target_suffix}-test-depends"
+    set(test_depends_target_name
+        "swift${test_subset_target_suffix}${test_mode_target_suffix}-test-depends")
+    add_custom_target("${test_depends_target_name}"
         DEPENDS "swift${test_subset_target_suffix}${test_mode_target_suffix}${SWIFT_PRIMARY_VARIANT_SUFFIX}-test-depends")
+    set_property(TARGET "${test_depends_target_name}"
+        PROPERTY FOLDER "Tests/check-swift")
   endforeach()
 endforeach()

tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

@@ -11,6 +11,8 @@ function(add_sourcekit_symbol_exports target_name export_file)
     add_custom_target(${target_name}_exports DEPENDS symbol.exports)
     set_property(DIRECTORY APPEND
       PROPERTY ADDITIONAL_MAKE_CLEAN_FILES symbol.exports)
+    set_target_properties(${target_name}_exports PROPERTIES
+      FOLDER "SourceKit libraries")
 
     get_property(srcs TARGET ${target_name} PROPERTY SOURCES)
     foreach(src ${srcs})