diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-18 14:50:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-11-18 14:50:57 (GMT) |
| commit | 0e46dea3430958183cb514c2a5518b5079ef588c (patch) | |
| tree | 0881493aee815754b1f5c1d75f20b98730c95afb /Source/CPack/cmCPackNSISGenerator.cxx | |
| parent | bd1655571738126eaf878960423a648cb34baf0b (diff) | |
| parent | 7d6ab5dc5bac806a268eac55deaf5bc550aaa6d4 (diff) | |
| download | CMake-0e46dea3430958183cb514c2a5518b5079ef588c.zip CMake-0e46dea3430958183cb514c2a5518b5079ef588c.tar.gz CMake-0e46dea3430958183cb514c2a5518b5079ef588c.tar.bz2 | |
Merge topic 'cpack-custom-templates'
7d6ab5dc5b CPack: Restore support for custom package configuration templates
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4054
Diffstat (limited to 'Source/CPack/cmCPackNSISGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index f90a740..4702639 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -39,8 +39,7 @@ int cmCPackNSISGenerator::PackageFiles() { // TODO: Fix nsis to force out file name - std::string nsisInFileName = - this->FindTemplate("Internal/CPack/NSIS.template.in"); + std::string nsisInFileName = this->FindTemplate("NSIS.template.in"); if (nsisInFileName.empty()) { cmCPackLogger(cmCPackLog::LOG_ERROR, "CPack error: Could not find NSIS installer template file." @@ -48,7 +47,7 @@ int cmCPackNSISGenerator::PackageFiles() return false; } std::string nsisInInstallOptions = - this->FindTemplate("Internal/CPack/NSIS.InstallOptions.ini.in"); + this->FindTemplate("NSIS.InstallOptions.ini.in"); if (nsisInInstallOptions.empty()) { cmCPackLogger(cmCPackLog::LOG_ERROR, "CPack error: Could not find NSIS installer options file." |