From 2246e0336db396058ebcec67527bf790a34a8e72 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 1 Aug 2007 14:58:55 -0400 Subject: BUG: also offer the extra generators in CMakeSetup Alex --- Source/MFCDialog/CMakeSetupDialog.cpp | 6 +++++- Source/cmExtraCodeBlocksGenerator.cxx | 3 ++- Source/cmake.cxx | 6 ++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp index e17a03d..d9094c0 100644 --- a/Source/MFCDialog/CMakeSetupDialog.cpp +++ b/Source/MFCDialog/CMakeSetupDialog.cpp @@ -11,6 +11,7 @@ #include "PathDialog.h" #include "CMakeSetupDialog.h" #include "CMakeCommandLineInfo.h" +#include "../cmExternalMakefileProjectGenerator.h" #include "../cmListFileCache.h" #include "../cmCacheManager.h" #include "../cmake.h" @@ -1010,7 +1011,10 @@ void CMakeSetupDialog::LoadCacheFromDiskToGUI() if(!it.IsAtEnd()) { m_GeneratorPicked = true; - std::string curGen = it.GetValue(); + const char* extraGen = cachem->GetCacheValue("CMAKE_EXTRA_GENERATOR"); + std::string curGen = cmExternalMakefileProjectGenerator:: + CreateFullGeneratorName(it.GetValue(), extraGen); + if(m_GeneratorDialog.m_GeneratorChoiceString != curGen.c_str()) { m_GeneratorDialog.m_GeneratorChoiceString = curGen.c_str(); diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 92a306e..4a2850d 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -47,8 +47,9 @@ cmExtraCodeBlocksGenerator::cmExtraCodeBlocksGenerator() { #if defined(_WIN32) this->SupportedGlobalGenerators.push_back("NMake Makefiles"); - this->SupportedGlobalGenerators.push_back("MSYS Makefiles"); this->SupportedGlobalGenerators.push_back("MinGW Makefiles"); +// disable MSYS until somebody actually tests it +// this->SupportedGlobalGenerators.push_back("MSYS Makefiles"); #endif this->SupportedGlobalGenerators.push_back("Unix Makefiles"); } diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 85a1127..17b04e1 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1557,6 +1557,12 @@ void cmake::GetRegisteredGenerators(std::vector& names) { names.push_back(i->first); } + for(RegisteredExtraGeneratorsMap::const_iterator + i = this->ExtraGenerators.begin(); + i != this->ExtraGenerators.end(); ++i) + { + names.push_back(i->first); + } } cmGlobalGenerator* cmake::CreateGlobalGenerator(const char* name) -- cgit v0.12