From 331c5d458e09d0e94c8102139e2b81b69b83dd7d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lebel Date: Wed, 13 Apr 2022 19:47:39 -0400 Subject: 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 --- Source/CPack/IFW/cmCPackIFWInstaller.cxx | 6 +++--- 1 file 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); -- cgit v0.12