summaryrefslogtreecommitdiffstats
path: root/Source/MFCDialog/CMakeSetupDialog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/MFCDialog/CMakeSetupDialog.cpp')
-rw-r--r--Source/MFCDialog/CMakeSetupDialog.cpp6
1 files changed, 5 insertions, 1 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();