Merge pull request #9999 from owenv/owenv/missingexecs

Add CMake build support for missing Windows executables

Author: owenv

Package.swift

@@ -705,7 +705,7 @@ let package = Package(
         .executableTarget(
             /** Interacts with package collections */
             name: "swift-package-collection",
-            dependencies: ["Commands", "PackageCollectionsCommand"]
+            dependencies: ["PackageCollectionsCommand"]
         ),
         .executableTarget(
             /** Multi-command entry point for SwiftPM. */
@@ -722,7 +722,7 @@ let package = Package(
         .executableTarget(
             /** Interact with package registry */
             name: "swift-package-registry",
-            dependencies: ["Commands", "PackageRegistryCommand"]
+            dependencies: ["PackageRegistryCommand"]
         ),
         .executableTarget(
             /** Utility to produce the artifacts for prebuilts */

Sources/CMakeLists.txt

@@ -17,6 +17,7 @@ add_subdirectory(CoreCommands)
 add_subdirectory(DriverSupport)
 add_subdirectory(LLBuildManifest)
 add_subdirectory(PackageCollections)
+add_subdirectory(PackageCollectionsCommand)
 add_subdirectory(PackageCollectionsModel)
 add_subdirectory(PackageCollectionsSigning)
 add_subdirectory(PackageFingerprint)
@@ -39,6 +40,8 @@ add_subdirectory(swift-build)
 add_subdirectory(swift-experimental-sdk)
 add_subdirectory(swift-sdk)
 add_subdirectory(swift-package)
+add_subdirectory(swift-package-collection)
+add_subdirectory(swift-package-registry)
 add_subdirectory(swift-run)
 add_subdirectory(swift-test)
 add_subdirectory(SwiftPMBuildServer)

Sources/PackageCollectionsCommand/CMakeLists.txt

@@ -0,0 +1,25 @@
+# This source file is part of the Swift open source project
+#
+# Copyright (c) 2026 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+add_library(PackageCollectionsCommand
+  PackageCollectionsCommand.swift)
+# NOTE(compnerd) workaround for CMake not setting up include flags yet
+set_target_properties(PackageCollectionsCommand PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
+target_link_libraries(PackageCollectionsCommand PUBLIC
+  Basics
+  Commands
+  CoreCommands
+  PackageCollections
+  PackageModel
+  ArgumentParser)
+
+install(TARGETS PackageCollectionsCommand
+  ARCHIVE DESTINATION lib
+  LIBRARY DESTINATION lib
+  RUNTIME DESTINATION bin)

Sources/swift-package-collection/CMakeLists.txt

@@ -0,0 +1,18 @@
+# This source file is part of the Swift open source project
+#
+# Copyright (c) 2026 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+add_executable(swift-package-collection
+  Entrypoint.swift)
+target_link_libraries(swift-package-collection PRIVATE
+  PackageCollectionsCommand)
+
+target_compile_options(swift-package-collection PRIVATE
+  -parse-as-library)
+
+install(TARGETS swift-package-collection
+  RUNTIME DESTINATION bin)

Sources/swift-package-collection/Entrypoint.swift

@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Commands
 import PackageCollectionsCommand
 
 @main

Sources/swift-package-registry/CMakeLists.txt

@@ -0,0 +1,18 @@
+# This source file is part of the Swift open source project
+#
+# Copyright (c) 2021 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+
+add_executable(swift-package-registry
+  runner.swift)
+target_link_libraries(swift-package-registry PRIVATE
+  PackageRegistryCommand)
+
+target_compile_options(swift-package-registry PRIVATE
+  -parse-as-library)
+
+install(TARGETS swift-package-registry
+  RUNTIME DESTINATION bin)

Sources/swift-package-registry/runner.swift

@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Commands
 import PackageRegistryCommand
 
 @main