← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/cmake/jaunty-security

« back to all changes in this revision

Viewing changes to Source/MFCDialog/CMakeSetupDialog.cpp

  • Committer: Bazaar Package Importer
  • Author(s): A. Maitland Bottoms
  • Date: 2006-06-18 16:34:11 UTC
  • mfrom: (1.4.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060618163411-pi234s3v6jwlcmof
Tags: 2.4.2-1
http://bugs.debian.org/338324
http://bugs.debian.org/366663
http://bugs.debian.org/366664
* New upstream release (Closes: #338324)
* Put cmake .vim files into /usr/share/vim/addons/plugin/
  where they can be used. (Closes: #366663)
* Install cmake-mode.el so it can be used. (Closes: #366664)
* Ensure cmake FindKDE locates KDE libraries on Debian
  based distributions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Source/MFCDialog/CMakeSetupDialog.cpp
212
212
{
213
213
  delete m_CMakeInstance;
214
214
  // clean up globals 
215
 
  cmListFileCache::GetInstance()->ClearCache(); 
216
215
  cmDynamicLoader::FlushCache();
217
216
}
218
217
 
755
754
    if (cachem->LoadCache(path.c_str()))
756
755
      {
757
756
      if (it.Find("CMAKE_HOME_DIRECTORY"))
758
 
    {
759
 
    path = ConvertToWindowsPath(it.GetValue());
760
 
    this->m_WhereSource = path.c_str();
761
 
    this->m_WhereSourceControl.SetWindowText(this->m_WhereSource);
762
 
    this->OnChangeWhereSource();
763
 
    m_GeneratorPicked = true;
764
 
    }
 
757
        {
 
758
        path = ConvertToWindowsPath(it.GetValue());
 
759
        this->m_WhereSource = path.c_str();
 
760
        this->m_WhereSourceControl.SetWindowText(this->m_WhereSource);
 
761
        this->OnChangeWhereSource();
 
762
        m_GeneratorPicked = true;
 
763
        }
765
764
      }
766
 
  else
767
 
    {
 
765
    else
 
766
      {
768
767
      //file exists but cqnnot be read
769
768
      cmSystemTools::Error("There is a CMakeCache.txt file for the current binary tree but cmake does not have permission to read it. Please check the permissions of the directory you are trying to run CMake on.");
770
769
      return;