FIX: drag&drop on CMake icon was not working anymore.
- the cmake instance had to be created before accessing the cache (doh) - the cache iterator was not queried properly (seems the API changed)
This commit is contained in:
parent
7928df0817
commit
0b8dcaddd2
|
@ -128,7 +128,10 @@ CMakeSetupDialog::CMakeSetupDialog(const CMakeCommandLineInfo& cmdInfo,
|
|||
cmSystemTools::SetErrorCallback(MFCMessageCallback);
|
||||
m_RegistryKey = "Software\\Kitware\\CMakeSetup\\Settings\\StartPath";
|
||||
m_CacheEntriesList.m_CMakeSetupDialog = this;
|
||||
|
||||
|
||||
m_CMakeInstance = new cmake;
|
||||
m_CMakeInstance->SetProgressCallback(updateProgress, (void *)this);
|
||||
|
||||
//{{AFX_DATA_INIT(CMakeSetupDialog)
|
||||
//}}AFX_DATA_INIT
|
||||
|
||||
|
@ -164,9 +167,6 @@ CMakeSetupDialog::CMakeSetupDialog(const CMakeCommandLineInfo& cmdInfo,
|
|||
|
||||
m_oldCX = -1;
|
||||
m_deltaXRemainder = 0;
|
||||
m_CMakeInstance = new cmake;
|
||||
m_CMakeInstance->SetProgressCallback(updateProgress, (void *)this);
|
||||
|
||||
}
|
||||
|
||||
CMakeSetupDialog::~CMakeSetupDialog()
|
||||
|
@ -1338,7 +1338,7 @@ void CMakeSetupDialog::ChangeDirectoriesFromFile(const char* buffer)
|
|||
path = ConvertToWindowsPath(path.c_str());
|
||||
this->m_WhereBuild = path.c_str();
|
||||
|
||||
path = ConvertToWindowsPath(it.GetName());
|
||||
path = ConvertToWindowsPath(it.GetValue());
|
||||
this->m_WhereSource = path.c_str();
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue