Răsfoiți Sursa

CPack fix regression between 2.8.7 and 2.8.8 when running cpack with no arg.

In 2.8.7 running cpack with no arguments would run the packaging iff
a CPackConfig.cmake file is found whereas
In 2.8.8 it displays the help.
This commit restore the 2.8.7.
We should add a test for this but this is not included in this commit.
Eric NOULARD 13 ani în urmă
părinte
comite
926d634d3e
1 a modificat fișierele cu 6 adăugiri și 2 ștergeri
  1. 6 2
      Source/CPack/cpack.cxx

+ 6 - 2
Source/CPack/cpack.cxx

@@ -294,8 +294,12 @@ int main (int argc, char *argv[])
 
   cmDocumentation doc;
   doc.addCPackStandardDocSections();
-  /* Were we invoked to display doc or to do some work ? */
-  if(doc.CheckOptions(argc, argv,"-G") || nocwd)
+  /* Were we invoked to display doc or to do some work ?
+   * Unlike cmake launching cpack with zero argument
+   * should launch cpack using "cpackConfigFile" if it exists
+   * in the current directory.
+   */
+  if((doc.CheckOptions(argc, argv,"-G") || nocwd) && !(argc==1))
     {
       help = true;
     }