|
|
@@ -180,7 +180,6 @@ int main (int argc, char *argv[])
|
|
|
{
|
|
|
cmSystemTools::FindExecutableDirectory(argv[0]);
|
|
|
cmCPackLog log;
|
|
|
- int nocwd = 0;
|
|
|
|
|
|
log.SetErrorPrefix("CPack Error: ");
|
|
|
log.SetWarningPrefix("CPack Warning: ");
|
|
|
@@ -193,7 +192,7 @@ int main (int argc, char *argv[])
|
|
|
{
|
|
|
cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
|
|
|
"Current working directory cannot be established." << std::endl);
|
|
|
- nocwd = 1;
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
std::string generator;
|
|
|
@@ -297,7 +296,7 @@ int main (int argc, char *argv[])
|
|
|
* should launch cpack using "cpackConfigFile" if it exists
|
|
|
* in the current directory.
|
|
|
*/
|
|
|
- if((doc.CheckOptions(argc, argv,"-G") || nocwd) && !(argc==1))
|
|
|
+ if((doc.CheckOptions(argc, argv,"-G")) && !(argc==1))
|
|
|
{
|
|
|
help = true;
|
|
|
}
|