summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorGregor Jasny <gjasny@googlemail.com>2017-03-28 14:04:02 (GMT)
committerBrad King <brad.king@kitware.com>2017-03-28 20:06:29 (GMT)
commitc03141c04cededf6bf31d51627cd8b29c7668495 (patch)
treef88d4db6f9fc50eae5a25f64bb67f1e78eb1dc2a /Tests
parent1adbe223cd10ee133f5137da028ed86ddef7cc4d (diff)
downloadCMake-c03141c04cededf6bf31d51627cd8b29c7668495.zip
CMake-c03141c04cededf6bf31d51627cd8b29c7668495.tar.gz
CMake-c03141c04cededf6bf31d51627cd8b29c7668495.tar.bz2
Swift: Default to Swift 3.0 with Xcode 8.3 and later
Xcode 8.3 has dropped support for Swift 2.3 so that compiler and feature detection failed. Closes #16742
Diffstat (limited to 'Tests')
-rw-r--r--Tests/SwiftMix/ObjCMain.m8
-rw-r--r--Tests/SwiftMix/SwiftMain.swift7
2 files changed, 14 insertions, 1 deletions
diff --git a/Tests/SwiftMix/ObjCMain.m b/Tests/SwiftMix/ObjCMain.m
index 7fa90ae..5a8700c 100644
--- a/Tests/SwiftMix/ObjCMain.m
+++ b/Tests/SwiftMix/ObjCMain.m
@@ -1,4 +1,10 @@
#import "SwiftMix-Swift.h"
int ObjCMain(int argc, char const* const argv[]) {
- return [SwiftMainClass SwiftMain:argc argv:argv];
+ if ([SwiftMainClass respondsToSelector:@selector(SwiftMain:argv:)]) {
+ return [SwiftMainClass SwiftMain:argc argv:argv];
+ }
+ if ([SwiftMainClass respondsToSelector:@selector(SwiftMainWithArgc:argv:)]) {
+ return [SwiftMainClass SwiftMainWithArgc:argc argv:argv];
+ }
+ return -1;
}
diff --git a/Tests/SwiftMix/SwiftMain.swift b/Tests/SwiftMix/SwiftMain.swift
index 3629ac8..921439a 100644
--- a/Tests/SwiftMix/SwiftMain.swift
+++ b/Tests/SwiftMix/SwiftMain.swift
@@ -3,10 +3,17 @@ import Foundation
@objc class SwiftMainClass : NSObject {
class func SwiftMain(argc:Int, argv:UnsafePointer<UnsafePointer<CChar>>) -> Int32 {
dump("argc: \(argc)")
+#if swift(>=3.0)
+ for i in 0 ..< argc {
+ let argi = String(cString:argv[i]);
+ dump("arg[\(i)]: \(argi)");
+ }
+#else
for (var i = 0; i < argc; ++i) {
let argi = String.fromCString(argv[i])
dump("arg[\(i)]: \(argi)");
}
+#endif
return 0;
}
}