diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-15 15:22:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-11-15 15:38:08 (GMT) |
| commit | 7d6ab5dc5bac806a268eac55deaf5bc550aaa6d4 (patch) | |
| tree | d5d621306ec833f6a5967cc31cebf013e402ee17 /Source/CPack/cmCPackNSISGenerator.cxx | |
| parent | c1d5d5eb11e0260ffadda0851ac844ab46b6b179 (diff) | |
| download | CMake-7d6ab5dc5bac806a268eac55deaf5bc550aaa6d4.zip CMake-7d6ab5dc5bac806a268eac55deaf5bc550aaa6d4.tar.gz CMake-7d6ab5dc5bac806a268eac55deaf5bc550aaa6d4.tar.bz2 | |
CPack: Restore support for custom package configuration templates
Refactoring in commit 98617f1be0 (Refactor: Move CPack internal files to
`Internal/CPack/` directory, 2019-07-09, v3.16.0-rc1~449^2) accidentally
changed the public-facing names of the templates. The name passed to
`FindTemplate` is searched in `CMAKE_MODULE_PATH` and should not change.
Remove the `Internal/CPack/` prefix on the names added by that commit.
Teach `FindTemplate` to use our builtin default directly when the
public-facing name is not found in `CMAKE_MODULE_PATH`.
Fixes: #19979
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 adea8ec..9bf72df 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." |