diff options
| author | David Cole <david.cole@kitware.com> | 2012-07-09 18:23:18 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-07-09 18:23:18 (GMT) |
| commit | 098e8de461158154210a41cc80c46a6926c68303 (patch) | |
| tree | 277796eba43ef533c0d3a949b2826a85276a0a17 | |
| parent | 6d75da5f38e7d1cebad9396c24b1724e342c036f (diff) | |
| parent | 926d634d3eba9b6a6d2043d44049ccd304e4ecac (diff) | |
| download | CMake-098e8de461158154210a41cc80c46a6926c68303.zip CMake-098e8de461158154210a41cc80c46a6926c68303.tar.gz CMake-098e8de461158154210a41cc80c46a6926c68303.tar.bz2 | |
Merge topic 'CPack-fixRegressionCPackWithNoArgs'
926d634 CPack fix regression between 2.8.7 and 2.8.8 when running cpack with no arg.
| -rw-r--r-- | Source/CPack/cpack.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 6f5055c..20824b1 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; } |