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:48 (GMT) |
| commit | 33c6d01e8264706c692a04dc51e2993150fdfd0b (patch) | |
| tree | 9ca1eb35b6d4c0532793140a7600fcc2171fa6f5 | |
| parent | 475d6ab002374852aa2fac1dd91084564ce95cab (diff) | |
| parent | 331c5d458e09d0e94c8102139e2b81b69b83dd7d (diff) | |
| download | CMake-33c6d01e8264706c692a04dc51e2993150fdfd0b.zip CMake-33c6d01e8264706c692a04dc51e2993150fdfd0b.tar.gz CMake-33c6d01e8264706c692a04dc51e2993150fdfd0b.tar.bz2 | |
Merge topic 'CPackIFW-extra-dot' into release-3.23
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); |