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

ENH: clean up command line arguments

This commit is contained in:
Bill Hoffman 2001-11-21 08:47:37 -05:00
parent 6156928549
commit 94c828bd1f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmake.cxx
View File

@ -66,9 +66,10 @@ void cmake::Usage(const char* program)
{ {
std::cerr << "cmake version " << cmMakefile::GetMajorVersion() std::cerr << "cmake version " << cmMakefile::GetMajorVersion()
<< "." << cmMakefile::GetMinorVersion() << "\n"; << "." << cmMakefile::GetMinorVersion() << "\n";
std::cerr << "Usage: " << program << " srcdir \n" std::cerr << "Usage: " << program << " srcdir [options]\n"
<< "Where cmake is run from the directory where you want the object files written\n"; << "Where cmake is run from the directory where you want the object files written\n";
std::cerr << "[-GgeneratorName] (where generator name can be: "; std::cerr << "Options are:\n";
std::cerr << "[-GgeneratorName] (where generator name can be one of these: ";
std::vector<std::string> names; std::vector<std::string> names;
cmMakefileGenerator::GetRegisteredGenerators(names); cmMakefileGenerator::GetRegisteredGenerators(names);
for(std::vector<std::string>::iterator i =names.begin(); for(std::vector<std::string>::iterator i =names.begin();
@ -76,6 +77,7 @@ void cmake::Usage(const char* program)
{ {
std::cerr << "\"" << i->c_str() << "\" "; std::cerr << "\"" << i->c_str() << "\" ";
} }
std::cerr << "\n-DVAR:TYPE=VALUE (create a cache file entry)\n";
std::cerr << ")\n"; std::cerr << ")\n";
} }
@ -169,6 +171,10 @@ void cmake::SetArgs(cmMakefile& builder, const std::vector<std::string>& args)
{ {
m_Verbose = true; m_Verbose = true;
} }
else if(arg.find("-D",0) == 0)
{
// skip for now
}
else if(arg.find("-G",0) == 0) else if(arg.find("-G",0) == 0)
{ {
std::string value = arg.substr(2); std::string value = arg.substr(2);
@ -193,9 +199,9 @@ void cmake::SetArgs(cmMakefile& builder, const std::vector<std::string>& args)
builder.SetStartOutputDirectory builder.SetStartOutputDirectory
(cmSystemTools::GetCurrentWorkingDirectory().c_str()); (cmSystemTools::GetCurrentWorkingDirectory().c_str());
builder.SetHomeDirectory builder.SetHomeDirectory
(cmSystemTools::CollapseFullPath(args[1].c_str()).c_str()); (cmSystemTools::CollapseFullPath(arg.c_str()).c_str());
builder.SetStartDirectory builder.SetStartDirectory
(cmSystemTools::CollapseFullPath(args[1].c_str()).c_str()); (cmSystemTools::CollapseFullPath(arg.c_str()).c_str());
} }
} }
if(!directoriesSet) if(!directoriesSet)