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

ENH: Report error and exit when the current directory is not specified

This commit is contained in:
Andy Cedilnik 2004-04-21 10:34:08 -04:00
parent 00095676cc
commit 4d55c6540a
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmakemain.cxx
View File

@ -110,7 +110,15 @@ int main(int ac, char** av)
int do_cmake(int ac, char** av) int do_cmake(int ac, char** av)
{ {
cmDocumentation doc; cmDocumentation doc;
if(doc.CheckOptions(ac, av)) int nocwd = 0;
if ( cmSystemTools::GetCurrentWorkingDirectory().size() == 0 )
{
std::cerr << "Current working directory cannot be established." << std::endl;
nocwd = 1;
}
if(doc.CheckOptions(ac, av) || nocwd)
{ {
// Construct and print requested documentation. // Construct and print requested documentation.
cmake hcm; cmake hcm;

11
Source/ctest.cxx
View File

@ -101,6 +101,15 @@ static const cmDocumentationEntry cmDocumentationSeeAlso[] =
int main (int argc, char *argv[]) int main (int argc, char *argv[])
{ {
cmSystemTools::EnableMSVCDebugHook(); cmSystemTools::EnableMSVCDebugHook();
int nocwd = 0;
if ( cmSystemTools::GetCurrentWorkingDirectory().size() == 0 )
{
std::cerr << "Current working directory cannot be established." << std::endl;
nocwd = 1;
}
// If there is a testing input file, check for documentation options // If there is a testing input file, check for documentation options
// only if there are actually arguments. We want running without // only if there are actually arguments. We want running without
@ -114,7 +123,7 @@ int main (int argc, char *argv[])
std::cout << "*********************************" << std::endl; std::cout << "*********************************" << std::endl;
} }
cmDocumentation doc; cmDocumentation doc;
if(doc.CheckOptions(argc, argv)) if(doc.CheckOptions(argc, argv) || nocwd)
{ {
// Construct and print requested documentation. // Construct and print requested documentation.
doc.SetName("ctest"); doc.SetName("ctest");