diff options
| author | Brad King <brad.king@kitware.com> | 2022-04-15 12:24:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-04-15 12:24:49 (GMT) |
| commit | 16e47d64cf1a94a426c810b661f96f6f89dbf9cb (patch) | |
| tree | 6a9288555cb724f14be8ab65989bf93fb6f11382 | |
| parent | 0af27df6c72809ce50beee53c95211996d7756c9 (diff) | |
| parent | 331c5d458e09d0e94c8102139e2b81b69b83dd7d (diff) | |
| download | CMake-16e47d64cf1a94a426c810b661f96f6f89dbf9cb.zip CMake-16e47d64cf1a94a426c810b661f96f6f89dbf9cb.tar.gz CMake-16e47d64cf1a94a426c810b661f96f6f89dbf9cb.tar.bz2 | |
Merge topic 'CPackIFW-extra-dot'
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
| -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); |