summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-02-24 14:33:59 (GMT)
committerBrad King <brad.king@kitware.com>2021-02-24 14:33:59 (GMT)
commit06e16ea008bf6efbe68028279539cfc6d1ff7a93 (patch)
tree32d9e2b807f4027033b02db6a3a189cf459c0698 /Help
parentafaa69f5b3812904177eb96dfb59a505a7e165d7 (diff)
parent431dd59b5e30000c3e3860af69c0dd387634205b (diff)
downloadCMake-06e16ea008bf6efbe68028279539cfc6d1ff7a93.zip
CMake-06e16ea008bf6efbe68028279539cfc6d1ff7a93.tar.gz
CMake-06e16ea008bf6efbe68028279539cfc6d1ff7a93.tar.bz2
Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments
Diffstat (limited to 'Help')
-rw-r--r--Help/release/3.19.rst9
1 files changed, 8 insertions, 1 deletions
diff --git a/Help/release/3.19.rst b/Help/release/3.19.rst
index d8f4f9d..1d55f1e 100644
--- a/Help/release/3.19.rst
+++ b/Help/release/3.19.rst
@@ -409,7 +409,6 @@ Changes made since CMake 3.19.0 include the following.
:generator:`Visual Studio 14 2015` generator. It has now been fixed to
work with :ref:`Visual Studio Generators` for later VS versions too.
-
3.19.5
------
@@ -425,3 +424,11 @@ Changes made since CMake 3.19.0 include the following.
*Link Binaries With Libraries* build phase broke the ability to switch
between device and simulator builds without reconfiguring. That capability
has now been restored.
+
+3.19.6
+------
+
+* The :manual:`cmake-presets(7)` feature no longer allows comments in
+ ``CMakePresets.json`` or ``CMakeUserPresets.json`` files.
+ This was mistakenly allowed by the implementation in CMake 3.19.0 through
+ CMake 3.19.5, and was not documented.