Add swift-argument-parser to the cmake build

Author: owenv

CMakeLists.txt

@@ -42,6 +42,7 @@ endif()
 find_package(dispatch QUIET)
 find_package(Foundation QUIET)
 find_package(Yams CONFIG REQUIRED)
+find_package(ArgumentParser CONFIG REQUIRED)
 
 add_subdirectory(Sources)
 add_subdirectory(cmake/modules)

Package.resolved

@@ -5,9 +5,21 @@
         "package": "swift-argument-parser",
         "repositoryURL": "https://github.com/apple/swift-argument-parser.git",
         "state": {
+<<<<<<< HEAD
           "branch": null,
           "revision": "15351c1cd009eba0b6e438bfef55ea9847a8dc4a",
           "version": "0.3.0"
+=======
+<<<<<<< HEAD
+          "branch": "master",
+          "revision": "15351c1cd009eba0b6e438bfef55ea9847a8dc4a",
+          "version": null
+=======
+          "branch": null,
+          "revision": "223d62adc52d51669ae2ee19bdb8b7d9fd6fcd9c",
+          "version": "0.0.6"
+>>>>>>> Add swift-argument-parser to the cmake build
+>>>>>>> Add swift-argument-parser to the cmake build
         }
       },
       {

Package.swift

@@ -74,8 +74,13 @@ if ProcessInfo.processInfo.environment["SWIFT_DRIVER_LLBUILD_FWK"] == nil {
 if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
   package.dependencies += [
     .package(url: "https://github.com/apple/swift-tools-support-core.git", .branch("master")),
+<<<<<<< HEAD
     .package(url: "https://github.com/jpsim/Yams.git", .upToNextMinor(from: "4.0.0")),
     .package(url: "https://github.com/apple/swift-argument-parser.git", .exact("0.3.0"))
+=======
+    .package(url: "https://github.com/jpsim/Yams.git", .branch("master")),
+    .package(url: "https://github.com/apple/swift-argument-parser.git", .exact("0.0.6"))
+>>>>>>> Add swift-argument-parser to the cmake build
     ]
 } else {
     package.dependencies += [

README.md

@@ -44,11 +44,12 @@ all with CMake:
   ```
   cmake -B <llbuild-build-dir> -G Ninja <llbuild-source-dir> -DLLBUILD_SUPPORT_BINDINGS="Swift"
   ```
+* [swift-argument-parser](https://github.com/apple/swift-argument-parser)
 * [Yams](https://github.com/jpsim/Yams)
 
 Once those dependencies have built, build `swift-driver` itself:
 ```
-cmake -B <swift-driver-build-dir> -G Ninja <swift-driver-source-dir> -DTSC_DIR=<swift-tools-support-core-build-dir>/cmake/modules -DLLBuild_DIR=<llbuild-build-dir>/cmake/modules -DYams_DIR=<yamls-build-dir>/cmake/modules
+cmake -B <swift-driver-build-dir> -G Ninja <swift-driver-source-dir> -DTSC_DIR=<swift-tools-support-core-build-dir>/cmake/modules -DLLBuild_DIR=<llbuild-build-dir>/cmake/modules -DYams_DIR=<yamls-build-dir>/cmake/modules -DArgumentParser_DIR=<swift-argument-parser-build-dir>
 cmake --build <swift-driver-build-dir>
 ```
 

Sources/swift-help/CMakeLists.txt

@@ -9,5 +9,6 @@
 add_executable(swift-help
   main.swift)
 target_link_libraries(swift-help PUBLIC
-  SwiftOptions)
+  SwiftOptions
+  ArgumentParser)
 

Sources/swift-help/main.swift

@@ -12,7 +12,7 @@
 import SwiftOptions
 import ArgumentParser
 
-extension DriverKind: ExpressibleByArgument, Decodable {}
+extension DriverKind: ExpressibleByArgument {}
 
 struct SwiftHelp: ParsableCommand {
   @ArgumentParser.Option(name: .customLong("tool", withSingleDash: true),