← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Source/cmSetCommand.cxx

  • 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/cmSetCommand.cxx
3
3
  Program:   CMake - Cross-Platform Makefile Generator
4
4
  Module:    $RCSfile: cmSetCommand.cxx,v $
5
5
  Language:  C++
6
 
  Date:      $Date: 2005/06/03 18:17:59 $
7
 
  Version:   $Revision: 1.28 $
 
6
  Date:      $Date: 2006/03/15 16:02:07 $
 
7
  Version:   $Revision: 1.29 $
8
8
 
9
9
  Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
10
10
  See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
63
63
  // SET (VAR) // Removes the definition of VAR.
64
64
  if (args.size() == 1)
65
65
    {
66
 
    m_Makefile->RemoveDefinition(args[0].c_str());
 
66
    this->Makefile->RemoveDefinition(args[0].c_str());
67
67
    return true;
68
68
    }
69
69
 
134
134
 
135
135
  // see if this is already in the cache
136
136
  cmCacheManager::CacheIterator it = 
137
 
    m_Makefile->GetCacheManager()->GetCacheIterator(variable);
 
137
    this->Makefile->GetCacheManager()->GetCacheIterator(variable);
138
138
  if(!it.IsAtEnd() && (it.GetType() != cmCacheManager::UNINITIALIZED))
139
139
    {
140
140
    // if the set is trying to CACHE the value but the value
150
150
  // if it is meant to be in the cache then define it in the cache
151
151
  if(cache)
152
152
    {
153
 
    m_Makefile->AddCacheDefinition(variable,
 
153
    this->Makefile->AddCacheDefinition(variable,
154
154
                                   value.c_str(),
155
155
                                   docstring,
156
156
                                   type);
158
158
  else
159
159
    {
160
160
    // add the definition
161
 
    m_Makefile->AddDefinition(variable, value.c_str());
 
161
    this->Makefile->AddDefinition(variable, value.c_str());
162
162
    }
163
163
  return true;
164
164
}