[cmake-commits] alex committed CMakeSetupDialog.cpp 1.122 1.123
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Aug 1 14:58:57 EDT 2007
Update of /cvsroot/CMake/CMake/Source/MFCDialog
In directory public:/mounts/ram/cvs-serv26412/MFCDialog
Modified Files:
CMakeSetupDialog.cpp
Log Message:
BUG: also offer the extra generators in CMakeSetup
Alex
Index: CMakeSetupDialog.cpp
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/MFCDialog/CMakeSetupDialog.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- CMakeSetupDialog.cpp 5 Mar 2007 14:51:12 -0000 1.122
+++ CMakeSetupDialog.cpp 1 Aug 2007 18:58:55 -0000 1.123
@@ -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 @@
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();
More information about the Cmake-commits
mailing list