reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-24 20:19:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '16742-swift-3.0' into release

Browse Source
This commit is contained in:
Brad King 2017-03-29 10:40:59 -04:00
commit 6ca509e7c6
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/CMakeDetermineCompilerId.cmake
View File

@ -269,7 +269,13 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
set(id_toolset "")
endif()
if("${lang}" STREQUAL "Swift")
set(id_lang_version "SWIFT_VERSION = 2.3;")
if(CMAKE_Swift_LANGUAGE_VERSION)
set(id_lang_version "SWIFT_VERSION = ${CMAKE_Swift_LANGUAGE_VERSION};")
elseif(XCODE_VERSION VERSION_GREATER_EQUAL 8.3)
set(id_lang_version "SWIFT_VERSION = 3.0;")
else()
set(id_lang_version "SWIFT_VERSION = 2.3;")
endif()
else()
set(id_lang_version "")
endif()

6
Source/cmGlobalXCodeGenerator.cxx
View File

@ -3075,10 +3075,14 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
this->CreateString(this->GeneratorToolset));
}
if (this->GetLanguageEnabled("Swift")) {
std::string swiftVersion = "2.3";
std::string swiftVersion;
if (const char* vers = this->CurrentMakefile->GetDefinition(
"CMAKE_Swift_LANGUAGE_VERSION")) {
swiftVersion = vers;
} else if (this->XcodeVersion >= 83) {
swiftVersion = "3.0";
} else {
swiftVersion = "2.3";
}
buildSettings->AddAttribute("SWIFT_VERSION",
this->CreateString(swiftVersion));

2
Tests/SwiftMix/ObjCMain.m
View File

@ -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];
}

8
Tests/SwiftMix/SwiftMain.swift
View File

@ -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;
}
}