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.

This commit is contained in:
Brad King 2003-08-06 13:48:51 -04:00
parent 999810bc52
commit f86ffd72ca

View File

@ -181,7 +181,7 @@ CMakeSetupDialog::CMakeSetupDialog(const CMakeCommandLineInfo& cmdInfo,
this->m_WhereSource = _T(""); this->m_WhereSource = _T("");
this->m_WhereBuild = _T(""); this->m_WhereBuild = _T("");
this->m_AdvancedValues = FALSE; this->m_AdvancedValues = FALSE;
this->m_GeneratorChoiceString = _T(""); this->m_GeneratorChoiceString = cmdInfo.m_GeneratorChoiceString;
this->ChangeDirectoriesFromFile((LPCTSTR)cmdInfo.m_LastUnknownParameter); this->ChangeDirectoriesFromFile((LPCTSTR)cmdInfo.m_LastUnknownParameter);
} }
@ -1422,6 +1422,8 @@ void CMakeSetupDialog::ChangeDirectoriesFromFile(const char* arg)
path = ConvertToWindowsPath(it.GetValue()); path = ConvertToWindowsPath(it.GetValue());
m_WhereSource = path.c_str(); m_WhereSource = path.c_str();
m_GeneratorChoiceString = _T("");
return; return;
} }
} }