diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-28 17:45:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-05-28 17:45:04 (GMT) |
| commit | 4c33b4e3b10109288d59d7cd17853f814754b024 (patch) | |
| tree | a379c917e1fe9e678ad2b2a6a183569d1c91c66d /Source/CPack/cmCPackNSISGenerator.cxx | |
| parent | 59d9fa713158610b6183b214841d0f272ee6f900 (diff) | |
| parent | dd6fd62615ef816f5cbdbd8cd5f827a5cc360464 (diff) | |
| download | CMake-4c33b4e3b10109288d59d7cd17853f814754b024.zip CMake-4c33b4e3b10109288d59d7cd17853f814754b024.tar.gz CMake-4c33b4e3b10109288d59d7cd17853f814754b024.tar.bz2 | |
Merge branch 'master' into ci-msvc-14.29-16.10
Diffstat (limited to 'Source/CPack/cmCPackNSISGenerator.cxx')
| -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 f1cc677..6bd0d1b 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -437,7 +437,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( |