summaryrefslogtreecommitdiffstats
path: root/Source/CPack
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-03-31 14:54:31 (GMT)
committerBrad King <brad.king@kitware.com>2020-03-31 14:57:28 (GMT)
commitaa78a2537c267ffdb9b6926f5f01204e3b3dbb3e (patch)
treede180fd2f62ee5ad9527fb4f261f09b6cbf68c1b /Source/CPack
parente3185e3d1b92a95c18f22f70b3cef6944dd019eb (diff)
downloadCMake-aa78a2537c267ffdb9b6926f5f01204e3b3dbb3e.zip
CMake-aa78a2537c267ffdb9b6926f5f01204e3b3dbb3e.tar.gz
CMake-aa78a2537c267ffdb9b6926f5f01204e3b3dbb3e.tar.bz2
CPack/NSIS: Document and check requirement of at least NSIS 3.0
Since commit 9d2816544e (CPack/NSIS: Also preload the "UserInfo.dll" plugin, 2020-01-04, v3.17.0-rc1~204^2) we require NSIS 3.0. Since older versions do not support Windows 8 or above, we can now require at least version 3.0. Fixes: #20514
Diffstat (limited to 'Source/CPack')
-rw-r--r--Source/CPack/cmCPackNSISGenerator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 363f536..2a46627 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -453,12 +453,12 @@ int cmCPackNSISGenerator::InitializeInternal()
}
if (versionRex.find(output)) {
double nsisVersion = atof(versionRex.match(1).c_str());
- double minNSISVersion = 2.09;
+ double minNSISVersion = 3.0;
cmCPackLogger(cmCPackLog::LOG_DEBUG,
"NSIS Version: " << nsisVersion << std::endl);
if (nsisVersion < minNSISVersion) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
- "CPack requires NSIS Version 2.09 or greater. "
+ "CPack requires NSIS Version 3.0 or greater. "
"NSIS found on the system was: "
<< nsisVersion << std::endl);
return 0;