Просмотр исходного кода

Merge topic 'CPackIFW-extra-dot' into release-3.23

331c5d458e CPackIFW: Fix regression in icon file names

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Acked-by: Erlend E. Aasland <[email protected]>
Merge-request: !7174
Brad King 3 лет назад
Родитель
Сommit
33c6d01e82
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      Source/CPack/IFW/cmCPackIFWInstaller.cxx

+ 3 - 3
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);