From 926d634d3eba9b6a6d2043d44049ccd304e4ecac Mon Sep 17 00:00:00 2001 From: Eric NOULARD Date: Tue, 3 Jul 2012 15:28:07 +0200 Subject: [PATCH] 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. --- Source/CPack/cpack.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 6f5055ca8..20824b10d 100644 --- a/Source/CPack/cpack.cxx +++ b/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; }