浏览代码

CPack remove "-ALL" suffix for ALL-IN-ONE packages

First part fix of feature request 11814
Eric NOULARD 14 年之前
父节点
当前提交
8c450f6287
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      Source/CPack/cmCPackArchiveGenerator.cxx
  2. 1 1
      Source/CPack/cmCPackRPMGenerator.cxx

+ 1 - 1
Source/CPack/cmCPackArchiveGenerator.cxx

@@ -177,7 +177,7 @@ int cmCPackArchiveGenerator::PackageComponentsAllInOne(bool allComponent)
   packageFileNames.push_back(std::string(toplevel));
   packageFileNames.push_back(std::string(toplevel));
   packageFileNames[0] += "/"
   packageFileNames[0] += "/"
     +std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
     +std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
-    +"-ALL" + this->GetOutputExtension();
+    + this->GetOutputExtension();
   cmCPackLogger(cmCPackLog::LOG_VERBOSE,
   cmCPackLogger(cmCPackLog::LOG_VERBOSE,
                 "Packaging all groups in one package..."
                 "Packaging all groups in one package..."
                 "(CPACK_COMPONENTS_ALL_GROUPS_IN_ONE_PACKAGE is set)"
                 "(CPACK_COMPONENTS_ALL_GROUPS_IN_ONE_PACKAGE is set)"

+ 1 - 1
Source/CPack/cmCPackRPMGenerator.cxx

@@ -158,7 +158,7 @@ int cmCPackRPMGenerator::PackageComponentsAllInOne(bool allComponent)
                              );
                              );
   std::string outputFileName(
   std::string outputFileName(
             std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
             std::string(this->GetOption("CPACK_PACKAGE_FILE_NAME"))
-            +"-ALL"+ this->GetOutputExtension()
+            + this->GetOutputExtension()
                             );
                             );
   // all GROUP in one vs all COMPONENT in one
   // all GROUP in one vs all COMPONENT in one
   localToplevel += "/"+compInstDirName;
   localToplevel += "/"+compInstDirName;