kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Xcode: Port rudimentary Swift support to Xcode 8 

The `.pbxproj` file must now specify a `SWIFT_VERSION` value.
Set it to the legacy value of "2.3" for now.  Later this can
be made configurable (e.g. to "3.0").
This commit is contained in:
Brad King 2016-09-23 11:43:08 -04:00
parent 6757e66089
commit 49d50ad407
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/CMakeDetermineCompilerId.cmake
View File

@ -266,6 +266,11 @@ Id flags: ${testflags}
else() else()
set(id_toolset "") set(id_toolset "")
endif() endif()
if("${lang}" STREQUAL "Swift")
set(id_lang_version "SWIFT_VERSION = 2.3;")
else()
set(id_lang_version "")
endif()
if(CMAKE_OSX_DEPLOYMENT_TARGET) if(CMAKE_OSX_DEPLOYMENT_TARGET)
set(id_deployment_target set(id_deployment_target
"MACOSX_DEPLOYMENT_TARGET = \"${CMAKE_OSX_DEPLOYMENT_TARGET}\";") "MACOSX_DEPLOYMENT_TARGET = \"${CMAKE_OSX_DEPLOYMENT_TARGET}\";")

1
Modules/CompilerId/Xcode-3.pbxproj.in
View File

@ -84,6 +84,7 @@
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)"; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)";
SYMROOT = .; SYMROOT = .;
@id_toolset@ @id_toolset@
@id_lang_version@
@id_deployment_target@ @id_deployment_target@
@id_sdkroot@ @id_sdkroot@
}; };

3
Source/cmGlobalXCodeGenerator.cxx
View File

@ -2996,6 +2996,9 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
buildSettings->AddAttribute("GCC_VERSION", buildSettings->AddAttribute("GCC_VERSION",
this->CreateString(this->GeneratorToolset)); this->CreateString(this->GeneratorToolset));
} }
if (this->GetLanguageEnabled("Swift")) {
buildSettings->AddAttribute("SWIFT_VERSION", this->CreateString("2.3"));
}
std::string symroot = root->GetCurrentBinaryDirectory(); std::string symroot = root->GetCurrentBinaryDirectory();
symroot += "/build"; symroot += "/build";