diff options
| author | Jean-Philippe Lebel <jp@lebel.pro> | 2022-04-13 23:47:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-04-14 13:45:35 (GMT) |
| commit | 331c5d458e09d0e94c8102139e2b81b69b83dd7d (patch) | |
| tree | bd2d1df4e29847529961afd986ee02373fb8f517 /Source/CPack/IFW | |
| parent | 5b2e097fbf59a66c146fabaa189bf11b9ac1cf27 (diff) | |
| download | CMake-331c5d458e09d0e94c8102139e2b81b69b83dd7d.zip CMake-331c5d458e09d0e94c8102139e2b81b69b83dd7d.tar.gz CMake-331c5d458e09d0e94c8102139e2b81b69b83dd7d.tar.bz2 | |
CPackIFW: Fix regression in icon file names
Changes in commit 761b6e2466 (CPackIFW: Avoid colliding names for icons
/ logos, 2021-10-08, v3.23.0-rc1~546^2) accidentally left an extra `.`
in computed file names. Remove it.
Fixes: #23423
Diffstat (limited to 'Source/CPack/IFW')
| -rw-r--r-- | Source/CPack/IFW/cmCPackIFWInstaller.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx index 92ff6df..2feca75 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx +++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx @@ -424,7 +424,7 @@ void cmCPackIFWInstaller::GenerateInstallerFile() if (!this->Logo.empty()) { std::string srcName = cmSystemTools::GetFilenameName(this->Logo); std::string suffix = cmSystemTools::GetFilenameLastExtension(srcName); - std::string name = "cm_logo." + suffix; + std::string name = "cm_logo" + suffix; std::string path = this->Directory + "/config/" + name; cmsys::SystemTools::CopyFileIfDifferent(this->Logo, path); xout.Element("Logo", name); @@ -461,7 +461,7 @@ void cmCPackIFWInstaller::GenerateInstallerFile() std::string srcName = cmSystemTools::GetFilenameName(this->InstallerApplicationIcon); std::string suffix = cmSystemTools::GetFilenameLastExtension(srcName); - std::string name = "cm_appicon." + suffix; + std::string name = "cm_appicon" + suffix; std::string path = this->Directory + "/config/" + name; cmsys::SystemTools::CopyFileIfDifferent(this->InstallerApplicationIcon, path); @@ -476,7 +476,7 @@ void cmCPackIFWInstaller::GenerateInstallerFile() std::string srcName = cmSystemTools::GetFilenameName(this->InstallerWindowIcon); std::string suffix = cmSystemTools::GetFilenameLastExtension(srcName); - std::string name = "cm_winicon." + suffix; + std::string name = "cm_winicon" + suffix; std::string path = this->Directory + "/config/" + name; cmsys::SystemTools::CopyFileIfDifferent(this->InstallerWindowIcon, path); xout.Element("InstallerWindowIcon", name); |