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

minor bootstap fixes

Browse Source
This commit is contained in:
Ken Martin 2002-05-23 10:33:37 -04:00
parent 843da92405
commit 92c5ff5b40
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmake.cxx
View File

@ -353,7 +353,9 @@ void cmake::HandleBootstrap(cmMakefile& mf, const std::string& args0)
if (cmSystemTools::GetFilenameNameWithoutExtension(args0) == if (cmSystemTools::GetFilenameNameWithoutExtension(args0) ==
"bootstrap") "bootstrap")
{ {
int done = 0; // if the user specified a generator on the command line we do not
// need to prompt the user
int done = (mf.GetMakefileGenerator() != 0);
while (!done) while (!done)
{ {
@ -384,7 +386,6 @@ void cmake::HandleBootstrap(cmMakefile& mf, const std::string& args0)
else else
{ {
mf.SetMakefileGenerator(gen); mf.SetMakefileGenerator(gen);
mf.AddDefinition("CMAKE_BOOTSTRAP","1");
std::cout << std::cout <<
"\n\nThank You. CMake will now generate the appropriate files for\nbeing built with " << names[choice-1].c_str() << "\n\n"; "\n\nThank You. CMake will now generate the appropriate files for\nbeing built with " << names[choice-1].c_str() << "\n\n";
} }
@ -395,12 +396,13 @@ void cmake::HandleBootstrap(cmMakefile& mf, const std::string& args0)
count -1 << "\n"; count -1 << "\n";
} }
} }
mf.AddDefinition("CMAKE_BOOTSTRAP","1");
} }
} }
int cmake::Generate(const std::vector<std::string>& args, bool buildMakefiles) int cmake::Generate(const std::vector<std::string>& args, bool buildMakefiles)
{ {
if(args.size() == 1 && !cmSystemTools::FileExists("CMakeLists.txt")) if(args.size() == 1 && !cmSystemTools::FileExists("CMakeLists.txt"))
{ {
this->Usage(args[0].c_str()); this->Usage(args[0].c_str());
return -1; return -1;