diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-03 15:05:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-03 15:05:39 (GMT) |
| commit | 1524505e12290e9f4bd9155a6f2e45879d3cb9e5 (patch) | |
| tree | 33904ed02463f1f7b7de0e7eb2811d2012310b3f | |
| parent | ff56e78bea3a9c05e0a1ce3d128a0aad0849c1ac (diff) | |
| parent | c0572a15d6c6a2e643b13e21823f6fe7cd402a41 (diff) | |
| download | CMake-1524505e12290e9f4bd9155a6f2e45879d3cb9e5.zip CMake-1524505e12290e9f4bd9155a6f2e45879d3cb9e5.tar.gz CMake-1524505e12290e9f4bd9155a6f2e45879d3cb9e5.tar.bz2 | |
Merge topic 'minimal_nsis'
c0572a15d6 CPack/NSIS: Bump minimal version of NSIS to 3.03
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6425
| -rw-r--r-- | Help/cpack_gen/nsis.rst | 4 | ||||
| -rw-r--r-- | Help/release/dev/nsis-minimal-version.rst | 4 | ||||
| -rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Help/cpack_gen/nsis.rst b/Help/cpack_gen/nsis.rst index 02e33ba..983df77 100644 --- a/Help/cpack_gen/nsis.rst +++ b/Help/cpack_gen/nsis.rst @@ -3,8 +3,8 @@ CPack NSIS Generator CPack Nullsoft Scriptable Install System (NSIS) generator specific options. -.. versionchanged:: 3.17 - The NSIS generator requires NSIS 3.0 or newer. +.. versionchanged:: 3.22 + The NSIS generator requires NSIS 3.03 or newer. Variables specific to CPack NSIS generator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/Help/release/dev/nsis-minimal-version.rst b/Help/release/dev/nsis-minimal-version.rst new file mode 100644 index 0000000..b19597a --- /dev/null +++ b/Help/release/dev/nsis-minimal-version.rst @@ -0,0 +1,4 @@ +nsis-minimal-version.rst +------------------------ + +* The :cpack_gen:`CPack NSIS Generator` now requires NSIS 3.03 or later. diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 6bd0d1b..0379232 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -487,12 +487,12 @@ int cmCPackNSISGenerator::InitializeInternal() } if (versionRex.find(output)) { double nsisVersion = atof(versionRex.match(1).c_str()); - double minNSISVersion = 3.0; + double minNSISVersion = 3.03; cmCPackLogger(cmCPackLog::LOG_DEBUG, "NSIS Version: " << nsisVersion << std::endl); if (nsisVersion < minNSISVersion) { cmCPackLogger(cmCPackLog::LOG_ERROR, - "CPack requires NSIS Version 3.0 or greater. " + "CPack requires NSIS Version 3.03 or greater. " "NSIS found on the system was: " << nsisVersion << std::endl); return 0; |