mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-12 09:08:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Swift: Simplify mixed test case to make it version agnostic

Browse Source 
Issue: #16742
This commit is contained in:
Gregor Jasny
2017-03-29 15:32:01 +02:00
parent c03141c04c
commit 77139e320c
2 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/SwiftMix/ObjCMain.m
+1 -7
View File
@@ -1,10 +1,4 @@
#import "SwiftMix-Swift.h" #import "SwiftMix-Swift.h"
int ObjCMain(int argc, char const* const argv[]) { int ObjCMain(int argc, char const* const argv[]) {
if ([SwiftMainClass respondsToSelector:@selector(SwiftMain:argv:)]) { return [SwiftMainClass SwiftMain];
return [SwiftMainClass SwiftMain:argc argv:argv];
}
if ([SwiftMainClass respondsToSelector:@selector(SwiftMainWithArgc:argv:)]) {
return [SwiftMainClass SwiftMainWithArgc:argc argv:argv];
}
return -1;
} }
Tests/SwiftMix/SwiftMain.swift
+2 -13
View File
@@ -1,19 +1,8 @@
import Foundation import Foundation
@objc class SwiftMainClass : NSObject { @objc class SwiftMainClass : NSObject {
class func SwiftMain(argc:Int, argv:UnsafePointer<UnsafePointer<CChar>>) -> Int32 { class func SwiftMain() -> Int32 {
dump("argc: \(argc)") dump("Hello World!");
#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; return 0;
} }
} }