summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-09-14 19:02:47 (GMT)
committerBrad King <brad.king@kitware.com>2020-09-18 17:02:14 (GMT)
commit8d5f4c4db93959f77dc8fb185e4630df4ec26d98 (patch)
treed71f3fd9552500ecb52217bff53f4a7b37d6e18c /Help
parent2db623f554d5522350214a7c5bacd5ec2dec1b34 (diff)
downloadCMake-8d5f4c4db93959f77dc8fb185e4630df4ec26d98.zip
CMake-8d5f4c4db93959f77dc8fb185e4630df4ec26d98.tar.gz
CMake-8d5f4c4db93959f77dc8fb185e4630df4ec26d98.tar.bz2
Xcode: Switch to the "new build system" for Xcode 12 and above
Provide an option to switch back to the original build system via `-T buildsystem=1`. Fixes: #18088
Diffstat (limited to 'Help')
-rw-r--r--Help/generator/Xcode.rst3
-rw-r--r--Help/release/dev/xcode-12-new-build-system.rst7
-rw-r--r--Help/variable/CMAKE_XCODE_BUILD_SYSTEM.rst7
3 files changed, 16 insertions, 1 deletions
diff --git a/Help/generator/Xcode.rst b/Help/generator/Xcode.rst
index c0745dc..be03a22 100644
--- a/Help/generator/Xcode.rst
+++ b/Help/generator/Xcode.rst
@@ -30,3 +30,6 @@ Supported pairs are:
``buildsystem=<variant>``
Specify the buildsystem variant to use.
See the :variable:`CMAKE_XCODE_BUILD_SYSTEM` variable for allowed values.
+
+ For example, to select the original build system under Xcode 12,
+ run :manual:`cmake(1)` with the option ``-T buildsystem=1``.
diff --git a/Help/release/dev/xcode-12-new-build-system.rst b/Help/release/dev/xcode-12-new-build-system.rst
new file mode 100644
index 0000000..7a497b0
--- /dev/null
+++ b/Help/release/dev/xcode-12-new-build-system.rst
@@ -0,0 +1,7 @@
+xcode-12-new-build-system
+-------------------------
+
+* The :generator:`Xcode` generator now uses the Xcode "new build system"
+ when generating for Xcode 12.0 or higher.
+ See the :variable:`CMAKE_XCODE_BUILD_SYSTEM` variable.
+ One may use ``-T buildsystem=1`` to switch to the legacy build system.
diff --git a/Help/variable/CMAKE_XCODE_BUILD_SYSTEM.rst b/Help/variable/CMAKE_XCODE_BUILD_SYSTEM.rst
index 8696bbf..587a5c9 100644
--- a/Help/variable/CMAKE_XCODE_BUILD_SYSTEM.rst
+++ b/Help/variable/CMAKE_XCODE_BUILD_SYSTEM.rst
@@ -10,7 +10,12 @@ mature enough for use by CMake. The possible values are:
``1``
The original Xcode build system.
- This is the default.
+ This is the default when using Xcode 11.x or below.
+
+``12``
+ The Xcode "new build system" introduced by Xcode 10.
+ It became mature enough for use by CMake in Xcode 12.
+ This is the default when using Xcode 12.x or above.
The ``CMAKE_XCODE_BUILD_SYSTEM`` variable is informational and should not
be modified by project code. See the :ref:`Xcode Build System Selection`