diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-01 14:42:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-01 14:43:24 (GMT) |
| commit | d68794a7076b833e82577423e2e7cf1f857ac5f3 (patch) | |
| tree | e1ad98e65bb51abeb529d7998d7bb2162ff5ddd2 /Source | |
| parent | 9b3280185927e3a9111baf58bc9ff9b71a66d36d (diff) | |
| parent | aa78a2537c267ffdb9b6926f5f01204e3b3dbb3e (diff) | |
| download | CMake-d68794a7076b833e82577423e2e7cf1f857ac5f3.zip CMake-d68794a7076b833e82577423e2e7cf1f857ac5f3.tar.gz CMake-d68794a7076b833e82577423e2e7cf1f857ac5f3.tar.bz2 | |
Merge topic 'cpack-nsis-version' into release-3.17
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 'Source')
| -rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 4 |
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; |