diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-23 13:10:59 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-02-23 13:11:05 (GMT) |
| commit | ec5f76753ad92ac03a4581d67a302792e030b6c4 (patch) | |
| tree | ca27cb50d035e6b5e44f2f14e6767c684cbf76b4 /Source | |
| parent | 581402f00c32172f8f74086ccfb26b20cf08dc5a (diff) | |
| parent | 8e8b99d01a6b2ce266a9401f760f4814a69e4853 (diff) | |
| download | CMake-ec5f76753ad92ac03a4581d67a302792e030b6c4.zip CMake-ec5f76753ad92ac03a4581d67a302792e030b6c4.tar.gz CMake-ec5f76753ad92ac03a4581d67a302792e030b6c4.tar.bz2 | |
Merge topic 'cpack_nsis_executable_custom'
8e8b99d01a CPack/NSIS: Add option for setting custom makensis executable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5839
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 263adfd..9b00704 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -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( |