mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-24 17:18:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

CPackIFW: Avoid colliding names for icons / logos

Browse Source 
Fixes: #16515
This commit is contained in:
Erlend E. Aasland
2021-10-08 13:15:30 +02:00
committed by Craig Scott
parent 315fc296e3
commit 761b6e2466
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/CPack/IFW/cmCPackIFWInstaller.cxx
+12 -4
View File
@@ -371,7 +371,9 @@ void cmCPackIFWInstaller::GenerateInstallerFile()
// Logo // Logo
if (!this->Logo.empty()) { if (!this->Logo.empty()) {
std::string name = cmSystemTools::GetFilenameName(this->Logo); std::string srcName = cmSystemTools::GetFilenameName(this->Logo);
std::string suffix = cmSystemTools::GetFilenameLastExtension(srcName);
std::string name = "cm_logo." + suffix;
std::string path = this->Directory + "/config/" + name; std::string path = this->Directory + "/config/" + name;
cmsys::SystemTools::CopyFileIfDifferent(this->Logo, path); cmsys::SystemTools::CopyFileIfDifferent(this->Logo, path);
xout.Element("Logo", name); xout.Element("Logo", name);
@@ -405,19 +407,25 @@ void cmCPackIFWInstaller::GenerateInstallerFile()
if (!this->IsVersionLess("1.4")) { if (!this->IsVersionLess("1.4")) {
// ApplicationIcon // ApplicationIcon
if (!this->InstallerApplicationIcon.empty()) { if (!this->InstallerApplicationIcon.empty()) {
std::string name = std::string srcName =
cmSystemTools::GetFilenameName(this->InstallerApplicationIcon); cmSystemTools::GetFilenameName(this->InstallerApplicationIcon);
std::string suffix = cmSystemTools::GetFilenameLastExtension(srcName);
std::string name = "cm_appicon." + suffix;
std::string path = this->Directory + "/config/" + name; std::string path = this->Directory + "/config/" + name;
name = cmSystemTools::GetFilenameWithoutExtension(name);
cmsys::SystemTools::CopyFileIfDifferent(this->InstallerApplicationIcon, cmsys::SystemTools::CopyFileIfDifferent(this->InstallerApplicationIcon,
path); path);
// The actual file is looked up by attaching a '.icns' (macOS),
// '.ico' (Windows). No functionality on Unix.
name = cmSystemTools::GetFilenameWithoutExtension(name);
xout.Element("InstallerApplicationIcon", name); xout.Element("InstallerApplicationIcon", name);
} }
// WindowIcon // WindowIcon
if (!this->InstallerWindowIcon.empty()) { if (!this->InstallerWindowIcon.empty()) {
std::string name = std::string srcName =
cmSystemTools::GetFilenameName(this->InstallerWindowIcon); cmSystemTools::GetFilenameName(this->InstallerWindowIcon);
std::string suffix = cmSystemTools::GetFilenameLastExtension(srcName);
std::string name = "cm_winicon." + suffix;
std::string path = this->Directory + "/config/" + name; std::string path = this->Directory + "/config/" + name;
cmsys::SystemTools::CopyFileIfDifferent(this->InstallerWindowIcon, path); cmsys::SystemTools::CopyFileIfDifferent(this->InstallerWindowIcon, path);
xout.Element("InstallerWindowIcon", name); xout.Element("InstallerWindowIcon", name);