kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'CPack-fixRegressionCPackWithNoArgs' 

926d634 CPack fix regression between 2.8.7 and 2.8.8 when running cpack with no arg.
This commit is contained in:
David Cole 2012-07-09 14:23:18 -04:00 committed by CMake Topic Stage
parent 6d75da5f38 926d634d3e
commit 098e8de461
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CPack/cpack.cxx
View File

@ -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;
}