summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2007-08-01 18:58:55 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2007-08-01 18:58:55 (GMT)
commit2246e0336db396058ebcec67527bf790a34a8e72 (patch)
tree2520c5e2ccb6ca13d840e8a22101aaad150d26e7
parentee91e2549921075b02f0a88fb48323b1c015228c (diff)
downloadCMake-2246e0336db396058ebcec67527bf790a34a8e72.zip
CMake-2246e0336db396058ebcec67527bf790a34a8e72.tar.gz
CMake-2246e0336db396058ebcec67527bf790a34a8e72.tar.bz2
BUG: also offer the extra generators in CMakeSetup
Alex
-rw-r--r--Source/MFCDialog/CMakeSetupDialog.cpp6
-rw-r--r--Source/cmExtraCodeBlocksGenerator.cxx3
-rw-r--r--Source/cmake.cxx6
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<std::string>& 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)