summaryrefslogtreecommitdiffstats
path: root/Source/cmakemain.cxx
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/cmakemain.cxx
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/cmakemain.cxx')
-rw-r--r--Source/cmakemain.cxx8
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 11a4267..4267841 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -344,19 +344,17 @@ int main(int ac, char** av)
int do_cmake(int ac, char** av)
{
- int nocwd = 0;
-
if ( cmSystemTools::GetCurrentWorkingDirectory().size() == 0 )
{
std::cerr << "Current working directory cannot be established."
<< std::endl;
- nocwd = 1;
+ return 1;
}
#ifdef CMAKE_BUILD_WITH_CMAKE
cmDocumentation doc;
doc.addCMakeStandardDocSections();
- if(doc.CheckOptions(ac, av, "-E") || nocwd)
+ if(doc.CheckOptions(ac, av, "-E"))
{
// Construct and print requested documentation.
cmake hcm;
@@ -424,7 +422,7 @@ int do_cmake(int ac, char** av)
return result;
}
#else
- if ( nocwd || ac == 1 )
+ if ( ac == 1 )
{
std::cout <<
"Bootstrap CMake should not be used outside CMake build process."