-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathswift-argument-parser.patch
95 lines (91 loc) · 4.43 KB
/
swift-argument-parser.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25282eb..6259e2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,17 +11,6 @@ option(BUILD_SHARED_LIBS "Build shared libraries by default" YES)
include(CTest)
include(SwiftSupport)
-if(CMAKE_VERSION VERSION_LESS 3.16 AND CMAKE_SYSTEM_NAME STREQUAL Windows)
- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-else()
- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-endif()
-
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift)
-
find_package(dispatch CONFIG)
find_package(Foundation CONFIG)
find_package(XCTest CONFIG)
diff --git a/Sources/ArgumentParser/CMakeLists.txt b/Sources/ArgumentParser/CMakeLists.txt
index 557873c..e5f4cf6 100644
--- a/Sources/ArgumentParser/CMakeLists.txt
+++ b/Sources/ArgumentParser/CMakeLists.txt
@@ -45,11 +45,8 @@ add_library(ArgumentParser
Utilities/SequenceExtensions.swift
Utilities/StringExtensions.swift
Utilities/Tree.swift)
-# NOTE: workaround for CMake not setting up include flags yet
-set_target_properties(ArgumentParser PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
target_compile_options(ArgumentParser PRIVATE
- $<$<BOOL:${BUILD_TESTING}>:-enable-testing>)
+ $<$<BOOL:${BUILD_TESTING}>:-enable-testing> -enable-library-evolution)
target_link_libraries(ArgumentParser PRIVATE
$<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>
ArgumentParserToolInfo)
diff --git a/Sources/ArgumentParser/Parsing/CommandParser.swift b/Sources/ArgumentParser/Parsing/CommandParser.swift
index 4aec2ab..88d85a3 100644
--- a/Sources/ArgumentParser/Parsing/CommandParser.swift
+++ b/Sources/ArgumentParser/Parsing/CommandParser.swift
@@ -273,6 +273,9 @@ struct AutodetectedGenerateCompletions: ParsableCommand {
@Flag() var generateCompletionScript = false
}
+func swiftBug72841Unwrap<T>(_ x: T) -> T { x }
+func swiftBug72841Unwrap<T>(_ x: T?) -> T { x! }
+
extension CommandParser {
func checkForCompletionScriptRequest(_ split: inout SplitArguments) throws {
// Pseudo-commands don't support `--generate-completion-script` flag
@@ -286,13 +289,13 @@ extension CommandParser {
// First look for `--generate-completion-script <shell>`
var completionsParser = CommandParser(GenerateCompletions.self)
if let result = try? completionsParser.parseCurrent(&split) as? GenerateCompletions {
- throw CommandError(commandStack: commandStack, parserError: .completionScriptRequested(shell: result.generateCompletionScript))
+ throw CommandError(commandStack: commandStack, parserError: .completionScriptRequested(shell: swiftBug72841Unwrap(result).generateCompletionScript))
}
// Check for for `--generate-completion-script` without a value
var autodetectedParser = CommandParser(AutodetectedGenerateCompletions.self)
if let result = try? autodetectedParser.parseCurrent(&split) as? AutodetectedGenerateCompletions,
- result.generateCompletionScript
+ swiftBug72841Unwrap(result).generateCompletionScript
{
throw CommandError(commandStack: commandStack, parserError: .completionScriptRequested(shell: nil))
}
diff --git a/Sources/ArgumentParserTestHelpers/CMakeLists.txt b/Sources/ArgumentParserTestHelpers/CMakeLists.txt
index 3d862f7..47e2378 100644
--- a/Sources/ArgumentParserTestHelpers/CMakeLists.txt
+++ b/Sources/ArgumentParserTestHelpers/CMakeLists.txt
@@ -1,8 +1,6 @@
add_library(ArgumentParserTestHelpers
StringHelpers.swift
TestHelpers.swift)
-set_target_properties(ArgumentParserTestHelpers PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
target_link_libraries(ArgumentParserTestHelpers PUBLIC
ArgumentParser
ArgumentParserToolInfo
diff --git a/Sources/ArgumentParserToolInfo/CMakeLists.txt b/Sources/ArgumentParserToolInfo/CMakeLists.txt
index b82adb7..cd707e5 100644
--- a/Sources/ArgumentParserToolInfo/CMakeLists.txt
+++ b/Sources/ArgumentParserToolInfo/CMakeLists.txt
@@ -1,8 +1,5 @@
add_library(ArgumentParserToolInfo STATIC
ToolInfo.swift)
-# NOTE: workaround for CMake not setting up include flags yet
-set_target_properties(ArgumentParserToolInfo PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
target_compile_options(ArgumentParserToolInfo PRIVATE
$<$<BOOL:${BUILD_TESTING}>:-enable-testing>)