diff options
author | Ken Martin <ken.martin@kitware.com> | 2002-05-28 12:56:39 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2002-05-28 12:56:39 (GMT) |
commit | ccbc8a3c8a9f3191e884c64a6032063c422ddaec (patch) | |
tree | 785139a33fef804476146283103c0883c55b125f /Source | |
parent | 7bb0869310a572539bb1dc020a67a3b40c03173a (diff) | |
download | CMake-ccbc8a3c8a9f3191e884c64a6032063c422ddaec.zip CMake-ccbc8a3c8a9f3191e884c64a6032063c422ddaec.tar.gz CMake-ccbc8a3c8a9f3191e884c64a6032063c422ddaec.tar.bz2 |
remobed bootstrap
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmake.cxx | 55 | ||||
-rw-r--r-- | Source/cmake.h | 8 |
2 files changed, 0 insertions, 63 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index d9ca529..6fef849 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -348,57 +348,6 @@ void cmake::AddCMakePaths(const std::vector<std::string>& args) } -void cmake::HandleBootstrap(cmMakefile& mf, const std::string& args0) -{ - if (cmSystemTools::GetFilenameNameWithoutExtension(args0) == - "bootstrap") - { - // 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) - { - int choice = 0; - std::cout << - "\n\nPlease select the tool you wish to use to build CMake." - "\nPlease note that selecting a tool here will not limit" - "\nwhat tools the resulting CMake executable supports.\n\n"; - std::vector<std::string> names; - cmMakefileGenerator::GetRegisteredGenerators(names); - int count = 1; - for(std::vector<std::string>::iterator i =names.begin(); - i != names.end(); ++i, ++count) - { - std::cout << "\t" << count << ") " << i->c_str() << "\n"; - } - std::cin >> choice; - if (choice > 0 && choice < count) - { - done = 1; - cmMakefileGenerator* gen = - cmMakefileGenerator::CreateGenerator(names[choice-1].c_str()); - if(!gen) - { - cmSystemTools::Error("Could not create named generator ", - names[choice-1].c_str()); - } - else - { - mf.SetMakefileGenerator(gen); - std::cout << - "\n\nThank You. CMake will now generate the appropriate files for\nbeing built with " << names[choice-1].c_str() << "\n\n"; - } - } - else - { - std::cout << "Please make a selection between 1 and " << - count -1 << "\n"; - } - } - mf.AddDefinition("CMAKE_BOOTSTRAP","1"); - } -} int cmake::Generate(const std::vector<std::string>& args, bool buildMakefiles) { @@ -451,10 +400,6 @@ int cmake::Generate(const std::vector<std::string>& args, bool buildMakefiles) // extract command line arguments that might add cache entries this->SetCacheArgs(mf, args); - // handle bootstraping command - this->HandleBootstrap(mf,args[0]); - - // no generator specified on the command line if(!mf.GetMakefileGenerator()) { diff --git a/Source/cmake.h b/Source/cmake.h index 32efd86..53203e3 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -52,14 +52,6 @@ class cmake void AddCMakePaths(const std::vector<std::string>&); /** - * Handle the case where cmake is being used to bootstrap itself. - * This typically happens on windows, where a cmake executable is - * used to produce makefiles for cmake itself. When bootstrapping - * CMAKE_BOOTSTRAP is set to 1 - */ - void HandleBootstrap(cmMakefile& builder, const std::string& arg0); - - /** * constructor */ cmake(); |