kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIX: fix for bug 1135

This commit is contained in:
Bill Hoffman 2005-02-11 14:36:57 -05:00
parent ef5db04e24
commit 71ff74d045
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/MFCDialog/CMakeSetupDialog.cpp
View File

@ -158,6 +158,7 @@ CMakeSetupDialog::CMakeSetupDialog(const CMakeCommandLineInfo& cmdInfo,
CWnd* pParent /*=NULL*/) CWnd* pParent /*=NULL*/)
: CDialog(CMakeSetupDialog::IDD, pParent) : CDialog(CMakeSetupDialog::IDD, pParent)
{ {
m_GeneratorPicked = false;
m_Cursor = LoadCursor(NULL, IDC_ARROW); m_Cursor = LoadCursor(NULL, IDC_ARROW);
m_RunningConfigure = false; m_RunningConfigure = false;
cmSystemTools::SetRunCommandHideConsole(true); cmSystemTools::SetRunCommandHideConsole(true);
@ -713,6 +714,11 @@ void CMakeSetupDialog::RunCMake(bool generateProjectFiles)
// Callback for build projects button // Callback for build projects button
void CMakeSetupDialog::OnConfigure() void CMakeSetupDialog::OnConfigure()
{ {
// if(!m_GeneratorPicked)
// {
// // generator has not been picked add one here
// }
// enable error messages each time configure is pressed // enable error messages each time configure is pressed
cmSystemTools::EnableMessages(); cmSystemTools::EnableMessages();
this->RunCMake(false); this->RunCMake(false);
@ -773,8 +779,13 @@ void CMakeSetupDialog::OnChangeWhereBuild()
this->m_WhereSource = path.c_str(); this->m_WhereSource = path.c_str();
this->m_WhereSourceControl.SetWindowText(this->m_WhereSource); this->m_WhereSourceControl.SetWindowText(this->m_WhereSource);
this->OnChangeWhereSource(); this->OnChangeWhereSource();
m_GeneratorPicked = true;
} }
else
{
m_GeneratorPicked = false;
}
m_CacheEntriesList.RemoveAll(); m_CacheEntriesList.RemoveAll();
m_CacheEntriesList.ShowWindow(SW_SHOW); m_CacheEntriesList.ShowWindow(SW_SHOW);
this->LoadCacheFromDiskToGUI(); this->LoadCacheFromDiskToGUI();
@ -979,6 +990,7 @@ void CMakeSetupDialog::LoadCacheFromDiskToGUI()
cachem->GetCacheIterator("CMAKE_GENERATOR"); cachem->GetCacheIterator("CMAKE_GENERATOR");
if(!it.IsAtEnd()) if(!it.IsAtEnd())
{ {
m_GeneratorPicked = true;
std::string curGen = it.GetValue(); std::string curGen = it.GetValue();
if(m_GeneratorChoiceString != curGen.c_str()) if(m_GeneratorChoiceString != curGen.c_str())
{ {
@ -1330,6 +1342,15 @@ void CMakeSetupDialog::OnHelpButton()
void CMakeSetupDialog::OnDeleteButton() void CMakeSetupDialog::OnDeleteButton()
{ {
std::string message = "Are you sure you want to delete the CMakeCache.txt file for:\n";
message += m_WhereBuild;
if(::MessageBox(0, message.c_str(), "Delete Cache?",
MB_YESNO|MB_TASKMODAL) == IDNO)
{
return;
}
m_GeneratorPicked = false;
if(m_WhereBuild != "" && this->m_CMakeInstance) if(m_WhereBuild != "" && this->m_CMakeInstance)
{ {
this->m_CMakeInstance->GetCacheManager()->DeleteCache(m_WhereBuild); this->m_CMakeInstance->GetCacheManager()->DeleteCache(m_WhereBuild);

1
Source/MFCDialog/CMakeSetupDialog.h
View File

@ -138,6 +138,7 @@ protected:
cmake *m_CMakeInstance; cmake *m_CMakeInstance;
HCURSOR m_Cursor; HCURSOR m_Cursor;
bool m_RunningConfigure; bool m_RunningConfigure;
bool m_GeneratorPicked;
}; };
//{{AFX_INSERT_LOCATION}} //{{AFX_INSERT_LOCATION}}