diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-30 12:52:26 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-30 12:52:37 (GMT) |
| commit | 7bb8b38cce0715c758aa3eb252a9dfc0bda1e2c7 (patch) | |
| tree | 4b659ac90a5c28c96e58d936f394c644639f8e42 /Tests | |
| parent | f6d802b5bcd201f48c7af47f27ec9e1dd0062171 (diff) | |
| parent | 77139e320c8ec7f92e1298cc57fea7276faceb12 (diff) | |
| download | CMake-7bb8b38cce0715c758aa3eb252a9dfc0bda1e2c7.zip CMake-7bb8b38cce0715c758aa3eb252a9dfc0bda1e2c7.tar.gz CMake-7bb8b38cce0715c758aa3eb252a9dfc0bda1e2c7.tar.bz2 | |
Merge topic '16742-swift-3.0'
77139e32 Swift: Simplify mixed test case to make it version agnostic
c03141c0 Swift: Default to Swift 3.0 with Xcode 8.3 and later
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !638
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/SwiftMix/ObjCMain.m | 2 | ||||
| -rw-r--r-- | Tests/SwiftMix/SwiftMain.swift | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/Tests/SwiftMix/ObjCMain.m b/Tests/SwiftMix/ObjCMain.m index 7fa90ae..20f0bf1 100644 --- a/Tests/SwiftMix/ObjCMain.m +++ b/Tests/SwiftMix/ObjCMain.m @@ -1,4 +1,4 @@ #import "SwiftMix-Swift.h" int ObjCMain(int argc, char const* const argv[]) { - return [SwiftMainClass SwiftMain:argc argv:argv]; + return [SwiftMainClass SwiftMain]; } diff --git a/Tests/SwiftMix/SwiftMain.swift b/Tests/SwiftMix/SwiftMain.swift index 3629ac8..a4a0a62 100644 --- a/Tests/SwiftMix/SwiftMain.swift +++ b/Tests/SwiftMix/SwiftMain.swift @@ -1,12 +1,8 @@ import Foundation @objc class SwiftMainClass : NSObject { - class func SwiftMain(argc:Int, argv:UnsafePointer<UnsafePointer<CChar>>) -> Int32 { - dump("argc: \(argc)") - for (var i = 0; i < argc; ++i) { - let argi = String.fromCString(argv[i]) - dump("arg[\(i)]: \(argi)"); - } + class func SwiftMain() -> Int32 { + dump("Hello World!"); return 0; } } |