summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-26 13:06:29 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-09-26 13:06:29 (GMT)
commitc6f07d06c610a9b1e6062d70ffc78c04bdf48ee4 (patch)
tree15a6961de923535d8695806223cec28cf8078388 /Help
parentd57a6493fc667f8a6ffa9fad2566a0cbea785ec5 (diff)
parentb35568f3f9f9b8f4b5b2a2e6f4d524540980c3ae (diff)
downloadCMake-c6f07d06c610a9b1e6062d70ffc78c04bdf48ee4.zip
CMake-c6f07d06c610a9b1e6062d70ffc78c04bdf48ee4.tar.gz
CMake-c6f07d06c610a9b1e6062d70ffc78c04bdf48ee4.tar.bz2
Merge topic 'xcode-swift-version'
b35568f3 Xcode: Add option to set Swift language version 49d50ad4 Xcode: Port rudimentary Swift support to Xcode 8
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-variables.7.rst1
-rw-r--r--Help/release/dev/xcode-swift-version.rst6
-rw-r--r--Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst5
3 files changed, 12 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 9e0efe9..d9da3d6 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -396,6 +396,7 @@ Variables for Languages
/variable/CMAKE_LANG_SOURCE_FILE_EXTENSIONS
/variable/CMAKE_LANG_STANDARD_INCLUDE_DIRECTORIES
/variable/CMAKE_LANG_STANDARD_LIBRARIES
+ /variable/CMAKE_Swift_LANGUAGE_VERSION
/variable/CMAKE_USER_MAKE_RULES_OVERRIDE_LANG
Variables for CTest
diff --git a/Help/release/dev/xcode-swift-version.rst b/Help/release/dev/xcode-swift-version.rst
new file mode 100644
index 0000000..5dff23c
--- /dev/null
+++ b/Help/release/dev/xcode-swift-version.rst
@@ -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.
diff --git a/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst b/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst
new file mode 100644
index 0000000..50121e2
--- /dev/null
+++ b/Help/variable/CMAKE_Swift_LANGUAGE_VERSION.rst
@@ -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.