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/cmCPackPKGGenerator.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/cmCPackPKGGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackPKGGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackPKGGenerator.cxx b/Source/CPack/cmCPackPKGGenerator.cxx index 328aac3..ac3d64d 100644 --- a/Source/CPack/cmCPackPKGGenerator.cxx +++ b/Source/CPack/cmCPackPKGGenerator.cxx @@ -108,7 +108,7 @@ void cmCPackPKGGenerator::WriteDistributionFile(const char* metapackageFile, const char* genName) { std::string distributionTemplate = - this->FindTemplate("Internal/CPack/CPack.distribution.dist.in"); + this->FindTemplate("CPack.distribution.dist.in"); if (distributionTemplate.empty()) { cmCPackLogger(cmCPackLog::LOG_ERROR, "Cannot find input file: " << distributionTemplate @@ -364,7 +364,7 @@ bool cmCPackPKGGenerator::CopyResourcePlistFile(const std::string& name, outName = name.c_str(); } - std::string inFName = cmStrCat("Internal/CPack/CPack.", name, ".in"); + std::string inFName = cmStrCat("CPack.", name, ".in"); std::string inFileName = this->FindTemplate(inFName.c_str()); if (inFileName.empty()) { cmCPackLogger(cmCPackLog::LOG_ERROR, |