1
0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-18 17:31:57 +08:00

CPack/NSIS: Add option for setting custom makensis executable

It allows users to set a custom one without changing the PATH environment variable.

Fixes: #21733
This commit is contained in:
Johnny Jazeix
2021-02-21 16:29:11 +01:00
parent 7aad4df2ff
commit 8e8b99d01a
3 changed files with 15 additions and 1 deletions

View File

@@ -193,3 +193,9 @@ on Windows Nullsoft Scriptable Install System.
.. versionadded:: 3.20 .. versionadded:: 3.20
If set, trim down the size of the control to the size of the branding text string. If set, trim down the size of the control to the size of the branding text string.
.. variable:: CPACK_NSIS_EXECUTABLE
.. versionadded:: 3.21
If set, specify the name of the NSIS executable. Default is ``makensis``.

View File

@@ -0,0 +1,6 @@
cpack-nsis-executable-name
--------------------------
* The :cpack_gen:`CPack NSIS Generator` gained a new variable
:variable:`CPACK_NSIS_EXECUTABLE` to specify the makensis
executable to use instead of the default one.

View File

@@ -430,7 +430,9 @@ int cmCPackNSISGenerator::InitializeInternal()
} }
#endif #endif
nsisPath = cmSystemTools::FindProgram("makensis", path, false); this->SetOptionIfNotSet("CPACK_NSIS_EXECUTABLE", "makensis");
nsisPath = cmSystemTools::FindProgram(
this->GetOption("CPACK_NSIS_EXECUTABLE"), path, false);
if (nsisPath.empty()) { if (nsisPath.empty()) {
cmCPackLogger( cmCPackLogger(