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

BUG: also offer the extra generators in CMakeSetup 

Alex
This commit is contained in:
Alexander Neundorf 2007-08-01 14:58:55 -04:00
parent ee91e25499
commit 2246e0336d
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/MFCDialog/CMakeSetupDialog.cpp
View File

@ -11,6 +11,7 @@
#include "PathDialog.h" #include "PathDialog.h"
#include "CMakeSetupDialog.h" #include "CMakeSetupDialog.h"
#include "CMakeCommandLineInfo.h" #include "CMakeCommandLineInfo.h"
#include "../cmExternalMakefileProjectGenerator.h"
#include "../cmListFileCache.h" #include "../cmListFileCache.h"
#include "../cmCacheManager.h" #include "../cmCacheManager.h"
#include "../cmake.h" #include "../cmake.h"
@ -1010,7 +1011,10 @@ void CMakeSetupDialog::LoadCacheFromDiskToGUI()
if(!it.IsAtEnd()) if(!it.IsAtEnd())
{ {
m_GeneratorPicked = true; 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()) if(m_GeneratorDialog.m_GeneratorChoiceString != curGen.c_str())
{ {
m_GeneratorDialog.m_GeneratorChoiceString = curGen.c_str(); m_GeneratorDialog.m_GeneratorChoiceString = curGen.c_str();

3
Source/cmExtraCodeBlocksGenerator.cxx
View File

@ -47,8 +47,9 @@ cmExtraCodeBlocksGenerator::cmExtraCodeBlocksGenerator()
{ {
#if defined(_WIN32) #if defined(_WIN32)
this->SupportedGlobalGenerators.push_back("NMake Makefiles"); this->SupportedGlobalGenerators.push_back("NMake Makefiles");
this->SupportedGlobalGenerators.push_back("MSYS Makefiles");
this->SupportedGlobalGenerators.push_back("MinGW Makefiles"); this->SupportedGlobalGenerators.push_back("MinGW Makefiles");
// disable MSYS until somebody actually tests it
// this->SupportedGlobalGenerators.push_back("MSYS Makefiles");
#endif #endif
this->SupportedGlobalGenerators.push_back("Unix Makefiles"); this->SupportedGlobalGenerators.push_back("Unix Makefiles");
} }

6
Source/cmake.cxx
View File

@ -1557,6 +1557,12 @@ void cmake::GetRegisteredGenerators(std::vector<std::string>& names)
{ {
names.push_back(i->first); 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) cmGlobalGenerator* cmake::CreateGlobalGenerator(const char* name)