summaryrefslogtreecommitdiffstats
path: root/Source/CPack
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-02-07 13:53:50 (GMT)
committerBrad King <brad.king@kitware.com>2013-02-07 13:53:50 (GMT)
commita943b5c4f3ed700f53c554b9f91942ad57047c18 (patch)
treeb65563866837ac68c77d096f6420fcfb9ad24f5b /Source/CPack
parent7df291fb6e6971f60cc7b338bcaa81069ed11757 (diff)
downloadCMake-a943b5c4f3ed700f53c554b9f91942ad57047c18.zip
CMake-a943b5c4f3ed700f53c554b9f91942ad57047c18.tar.gz
CMake-a943b5c4f3ed700f53c554b9f91942ad57047c18.tar.bz2
Fail early if no current working directory exists
Remove the old "nocwd" behavior that attempts to provide the "--help" output when no working directory is available. The long help output scrolls the real error message out of typical terminal sizes. Also execute as little code as possible when no working directory exists.
Diffstat (limited to 'Source/CPack')
-rw-r--r--Source/CPack/cpack.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 0ba7322..b188918 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -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;
}