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

Xcode: Add option to set Swift language version 

Create a new CMAKE_Swift_LANGUAGE_VERSION variable to specify the
SWIFT_VERSION attribute in a generated Xcode project.  Ideally this
would be a `<LANG>_STANDARD` property but since Swift support is
very minimal we should reserve that property for more complete
treatment later.

Issue: #16326
This commit is contained in:
Brad King 2016-09-23 13:25:35 -04:00
parent 49d50ad407
commit b35568f3f9
5 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Help/manual/cmake-variables.7.rst
View File

@ -396,6 +396,7 @@ Variables for Languages
/variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS /variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS
/variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES /variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES
/variable/CMAKE_LANG_STANDARD_LIBRARIES /variable/CMAKE_LANG_STANDARD_LIBRARIES
/variable/CMAKE_Swift_LANGUAGE_VERSION
/variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG /variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG
Variables for CTest Variables for CTest

6
Help/release/dev/xcode-swift-version.rst Normal file
View File

@ -0,0 +1,6 @@
xcode-swift-version
-------------------
* The :generator:`Xcode` generator's rudimentary Swift language support
learned to honor a new :variable:`CMAKE_Swift_LANGUAGE_VERSION` variable
to tell Xcode what version of Swift is used by the source.

5
Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst Normal file
View File

@ -0,0 +1,5 @@
CMAKE_Swift_LANGUAGE_VERSION
----------------------------
Set to the Swift language version number. If not set, the legacy "2.3"
version is assumed.

8
Source/cmGlobalXCodeGenerator.cxx
View File

@ -2997,7 +2997,13 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects(
this->CreateString(this->GeneratorToolset)); this->CreateString(this->GeneratorToolset));
} }
if (this->GetLanguageEnabled("Swift")) { if (this->GetLanguageEnabled("Swift")) {
buildSettings->AddAttribute("SWIFT_VERSION", this->CreateString("2.3")); std::string swiftVersion = "2.3";
if (const char* vers = this->CurrentMakefile->GetDefinition(
"CMAKE_Swift_LANGUAGE_VERSION")) {
swiftVersion = vers;
}
buildSettings->AddAttribute("SWIFT_VERSION",
this->CreateString(swiftVersion));
} }
std::string symroot = root->GetCurrentBinaryDirectory(); std::string symroot = root->GetCurrentBinaryDirectory();

4
Tests/SwiftOnly/CMakeLists.txt
View File

@ -1,4 +1,8 @@
cmake_minimum_required(VERSION 3.3) cmake_minimum_required(VERSION 3.3)
project(SwiftOnly Swift) project(SwiftOnly Swift)
if(NOT XCODE_VERSION VERSION_LESS 8.0)
set(CMAKE_Swift_LANGUAGE_VERSION 3.0)
endif()
add_executable(SwiftOnly main.swift) add_executable(SwiftOnly main.swift)