mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-20 22:20:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'CPackIFW-extra-dot'

Browse Source 
331c5d458e CPackIFW: Fix regression in icon file names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Erlend E. Aasland <erlend.aasland@innova.no>
Merge-request: !7174
This commit is contained in:
Brad King
2022-04-15 12:24:41 +00:00
committed by Kitware Robot
parent 0af27df6c7 331c5d458e
commit 16e47d64cf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/CPack/IFW/cmCPackIFWInstaller.cxx
View File

@@ -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);