BUG: If a directory is specified on the command line that is not an existing build tree, we should still use any -G option that was given to set the generator.

1 files changed, 3 insertions, 1 deletions

diff --git a/Source/MFCDialog/CMakeSetupDialog.cpp b/Source/MFCDialog/CMakeSetupDialog.cpp
index 524f2e4..77fb76e 100644
--- a/Source/MFCDialog/CMakeSetupDialog.cpp
+++ b/Source/MFCDialog/CMakeSetupDialog.cpp
@@ -181,7 +181,7 @@ CMakeSetupDialog::CMakeSetupDialog(const CMakeCommandLineInfo& cmdInfo,
     this->m_WhereSource = _T("");
     this->m_WhereBuild = _T("");
     this->m_AdvancedValues = FALSE;
-    this->m_GeneratorChoiceString = _T("");
+    this->m_GeneratorChoiceString = cmdInfo.m_GeneratorChoiceString;
     this->ChangeDirectoriesFromFile((LPCTSTR)cmdInfo.m_LastUnknownParameter);
     }
 
@@ -1422,6 +1422,8 @@ void CMakeSetupDialog::ChangeDirectoriesFromFile(const char* arg)
       
       path = ConvertToWindowsPath(it.GetValue());
       m_WhereSource = path.c_str();
+      
+      m_GeneratorChoiceString = _T("");
       return;
       }
     }