Skip to content

Commit ad95073

Browse files
committed
fix: solve merge conflict
2 parents fc96cbe + 932e6cd commit ad95073

39 files changed

+1215
-772
lines changed

.github/ISSUE_TEMPLATE/BUG_REPORT.md

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

100755100644
File mode changed.

CHANGELOG.md

Lines changed: 163 additions & 74 deletions
Large diffs are not rendered by default.

Examples/math/Math.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ extension Math.Statistics {
259259
}
260260
}
261261

262-
func customCompletion(_ s: [String], _: Int, _: Int) -> [String] {
262+
func customCompletion(_ s: [String], _: Int, _: String) -> [String] {
263263
(s.last ?? "").starts(with: "a")
264264
? ["aardvark", "aaaaalbert"]
265265
: ["hello", "helicopter", "heliotrope"]

Sources/ArgumentParser/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,11 @@ set_target_properties(ArgumentParser PROPERTIES
5959
target_compile_options(ArgumentParser PRIVATE
6060
$<$<BOOL:${BUILD_TESTING}>:-enable-testing>)
6161
target_link_libraries(ArgumentParser PRIVATE
62-
$<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>
6362
ArgumentParserToolInfo)
63+
if(Foundation_FOUND)
64+
target_link_libraries(ArgumentParser PRIVATE
65+
Foundation)
66+
endif()
6467

6568

6669
_install_target(ArgumentParser)

0 commit comments

Comments
 (0)