Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity

Merge topic 'cpack_nsis_executable_custom'

Browse Source 
8e8b99d01a CPack/NSIS: Add option for setting custom makensis executable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5839
This commit is contained in:
Brad King
2021-02-23 13:10:59 +00:00
committed by Kitware Robot
parent 581402f00c 8e8b99d01a
commit ec5f76753a
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Help/cpack_gen/nsis.rst
View File

@@ -193,3 +193,9 @@ on Windows Nullsoft Scriptable Install System.
.. versionadded:: 3.20
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``.

6
Help/release/dev/cpack-nsis-executable-name.rst Normal file
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.

4
Source/CPack/cmCPackNSISGenerator.cxx
View File

@@ -430,7 +430,9 @@ int cmCPackNSISGenerator::InitializeInternal()
}
#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()) {
cmCPackLogger(