diff options
| author | Ken Martin <ken.martin@kitware.com> | 2002-05-23 14:33:37 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2002-05-23 14:33:37 (GMT) |
| commit | 92c5ff5b4082c1db7d8806f9f884130f3082614b (patch) | |
| tree | 467566d6cfee0fe7e8520e256aaf01c7723dc063 | |
| parent | 843da9240584edd3eda63ae637891593ae8c729f (diff) | |
| download | CMake-92c5ff5b4082c1db7d8806f9f884130f3082614b.zip CMake-92c5ff5b4082c1db7d8806f9f884130f3082614b.tar.gz CMake-92c5ff5b4082c1db7d8806f9f884130f3082614b.tar.bz2 | |
minor bootstap fixes
| -rw-r--r-- | Source/cmake.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index b5b6883..d9ca529 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -353,7 +353,9 @@ void cmake::HandleBootstrap(cmMakefile& mf, const std::string& args0) if (cmSystemTools::GetFilenameNameWithoutExtension(args0) == "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) { @@ -384,7 +386,6 @@ void cmake::HandleBootstrap(cmMakefile& mf, const std::string& args0) else { mf.SetMakefileGenerator(gen); - mf.AddDefinition("CMAKE_BOOTSTRAP","1"); std::cout << "\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"; } } + mf.AddDefinition("CMAKE_BOOTSTRAP","1"); } } 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()); return -1; |