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

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.
This commit is contained in:
Eric NOULARD 2012-07-03 15:28:07 +02:00
parent b689f8e928
commit 926d634d3e
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; cmDocumentation doc;
doc.addCPackStandardDocSections(); doc.addCPackStandardDocSections();
/* Were we invoked to display doc or to do some work ? */ /* Were we invoked to display doc or to do some work ?
if(doc.CheckOptions(argc, argv,"-G") || nocwd) * 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; help = true;
} }