Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-20 12:53:55 +08:00
Code Issues Projects Releases Wiki Activity

CPack/NSIS: Bump minimal version of NSIS to 3.03

Browse Source 
Fixes: #22508
This commit is contained in:
Johnny Jazeix
2021-08-02 21:25:20 +02:00
parent 0660dc4dcf
commit c0572a15d6
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Help/cpack_gen/nsis.rst
View File

@@ -3,8 +3,8 @@ CPack NSIS Generator
CPack Nullsoft Scriptable Install System (NSIS) generator specific options. CPack Nullsoft Scriptable Install System (NSIS) generator specific options.
.. versionchanged:: 3.17 .. versionchanged:: 3.22
The NSIS generator requires NSIS 3.0 or newer. The NSIS generator requires NSIS 3.03 or newer.
Variables specific to CPack NSIS generator Variables specific to CPack NSIS generator
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

4
Help/release/dev/nsis-minimal-version.rst Normal file
View File

@@ -0,0 +1,4 @@
nsis-minimal-version.rst
------------------------
* The :cpack_gen:`CPack NSIS Generator` now requires NSIS 3.03 or later.

4
Source/CPack/cmCPackNSISGenerator.cxx
View File

@@ -487,12 +487,12 @@ int cmCPackNSISGenerator::InitializeInternal()
} }
if (versionRex.find(output)) { if (versionRex.find(output)) {
double nsisVersion = atof(versionRex.match(1).c_str()); double nsisVersion = atof(versionRex.match(1).c_str());
double minNSISVersion = 3.0; double minNSISVersion = 3.03;
cmCPackLogger(cmCPackLog::LOG_DEBUG, cmCPackLogger(cmCPackLog::LOG_DEBUG,
"NSIS Version: " << nsisVersion << std::endl); "NSIS Version: " << nsisVersion << std::endl);
if (nsisVersion < minNSISVersion) { if (nsisVersion < minNSISVersion) {
cmCPackLogger(cmCPackLog::LOG_ERROR, 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: " "NSIS found on the system was: "
<< nsisVersion << std::endl); << nsisVersion << std::endl);
return 0; return 0;