summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-04-01 14:42:31 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-04-01 14:43:25 (GMT)
commit4e69c9d8d83f7acd1174006dacb5ecd3b21c78a6 (patch)
treea04d6ca74fba4d20565c07a1096773ad0555f85f /Help
parent095cc2dc8d8e12828b6888ce72b771d1558c2834 (diff)
parentaa78a2537c267ffdb9b6926f5f01204e3b3dbb3e (diff)
downloadCMake-4e69c9d8d83f7acd1174006dacb5ecd3b21c78a6.zip
CMake-4e69c9d8d83f7acd1174006dacb5ecd3b21c78a6.tar.gz
CMake-4e69c9d8d83f7acd1174006dacb5ecd3b21c78a6.tar.bz2
Merge topic 'cpack-nsis-version'
aa78a2537c CPack/NSIS: Document and check requirement of at least NSIS 3.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4552
Diffstat (limited to 'Help')
-rw-r--r--Help/cpack_gen/nsis.rst4
-rw-r--r--Help/release/3.17.rst14
2 files changed, 17 insertions, 1 deletions
diff --git a/Help/cpack_gen/nsis.rst b/Help/cpack_gen/nsis.rst
index a310e9f..d1e495f 100644
--- a/Help/cpack_gen/nsis.rst
+++ b/Help/cpack_gen/nsis.rst
@@ -1,7 +1,9 @@
CPack NSIS Generator
--------------------
-CPack Nullsoft Scriptable Install System (NSIS) generator specific options
+CPack Nullsoft Scriptable Install System (NSIS) generator specific options.
+
+The NSIS generator requires NSIS 3.0 or newer.
Variables specific to CPack NSIS generator
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/Help/release/3.17.rst b/Help/release/3.17.rst
index c2cfdf0..7c5b44d 100644
--- a/Help/release/3.17.rst
+++ b/Help/release/3.17.rst
@@ -282,6 +282,8 @@ Deprecated and Removed Features
option and cannot be fixed without breaking compatibility, and so have
been superseded.
+* The :cpack_gen:`CPack NSIS Generator` now requires NSIS 3.0 or later.
+
Other Changes
=============
@@ -319,3 +321,15 @@ Other Changes
* The :generator:`Xcode` generator no longer hard-codes ``-Wmost``,
``-Wno-four-char-constants``, and ``-Wno-unknown-pragmas`` warning flags.
+
+Updates
+=======
+
+Changes made since CMake 3.17.0 include the following.
+
+3.17.1
+------
+
+* CMake 3.17.0 updated the :cpack_gen:`CPack NSIS Generator` with changes
+ that require NSIS 3.0 or later. CMake 3.17.1 now enforces the use
+ of a sufficiently new version.