Sfoglia il codice sorgente

CPack/NSIS: Bump minimal version of NSIS to 3.03

Fixes: #22508
Johnny Jazeix 4 anni fa
parent
commit
c0572a15d6

+ 2 - 2
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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

+ 4 - 0
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.

+ 2 - 2
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;