This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 8be433e2fbbab9a4b6634246d1b69c2d5fd27380 (commit) via 4da60024adfb312883b93e5e3cacd928aa2e79ce (commit) via 874a265c94ff17e07a96969c0a7f8f98a66b1074 (commit) from a9b52abbd4278e4c566965bcd2ba5b853f9f9ba2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8be433e2fbbab9a4b6634246d1b69c2d5fd27380 commit 8be433e2fbbab9a4b6634246d1b69c2d5fd27380 Merge: a9b52ab 4da6002 Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Thu Sep 3 14:31:34 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Sep 3 14:31:34 2015 -0400 Merge topic 'more-swift2-fixes' into next 4da60024 Swift: Fix Compiler-Id detection for Swift 2 874a265c Swift: Make SwiftMix compatible with Swift 2 http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4da60024adfb312883b93e5e3cacd928aa2e79ce commit 4da60024adfb312883b93e5e3cacd928aa2e79ce Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Thu Sep 3 15:56:52 2015 +0200 Commit: Gregor Jasny <gja...@googlemail.com> CommitDate: Thu Sep 3 20:30:45 2015 +0200 Swift: Fix Compiler-Id detection for Swift 2 diff --git a/Modules/CompilerId/main.swift.in b/Modules/CompilerId/main.swift.in index 962e857..13f0ba0 100644 --- a/Modules/CompilerId/main.swift.in +++ b/Modules/CompilerId/main.swift.in @@ -1 +1 @@ -println("CMakeSwiftCompilerId") +print("CMakeSwiftCompilerId") http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=874a265c94ff17e07a96969c0a7f8f98a66b1074 commit 874a265c94ff17e07a96969c0a7f8f98a66b1074 Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Thu Sep 3 15:26:06 2015 +0200 Commit: Gregor Jasny <gja...@googlemail.com> CommitDate: Thu Sep 3 20:30:32 2015 +0200 Swift: Make SwiftMix compatible with Swift 2 diff --git a/Tests/SwiftMix/SwiftMain.swift b/Tests/SwiftMix/SwiftMain.swift index 7e7c4ab..3629ac8 100644 --- a/Tests/SwiftMix/SwiftMain.swift +++ b/Tests/SwiftMix/SwiftMain.swift @@ -1,8 +1,10 @@ -@objc class SwiftMainClass { +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) { - var argi = String.fromCString(argv[i]) + let argi = String.fromCString(argv[i]) dump("arg[\(i)]: \(argi)"); } return 0; ----------------------------------------------------------------------- Summary of changes: Modules/CompilerId/main.swift.in | 2 +- Tests/SwiftMix/SwiftMain.swift | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits