← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Source/cmExecProgramCommand.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/cmExecProgramCommand.cxx
3
3
  Program:   CMake - Cross-Platform Makefile Generator
4
4
  Module:    $RCSfile: cmExecProgramCommand.cxx,v $
5
5
  Language:  C++
6
 
  Date:      $Date: 2004/06/24 12:57:54 $
7
 
  Version:   $Revision: 1.20 $
 
6
  Date:      $Date: 2006/05/11 02:15:09 $
 
7
  Version:   $Revision: 1.21.2.1 $
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.
112
112
    }
113
113
  else
114
114
    {
115
 
    result = cmSystemTools::RunCommand(command.c_str(), output, retVal, 0, verbose);
 
115
    result = cmSystemTools::RunCommand(command.c_str(), output, 
 
116
                                       retVal, 0, verbose);
116
117
    }
117
118
  if(!result)
118
119
    {
133
134
      }
134
135
    
135
136
    std::string coutput = std::string(output, first, last-first+1);
136
 
    m_Makefile->AddDefinition(output_variable.c_str(), coutput.c_str());
 
137
    this->Makefile->AddDefinition(output_variable.c_str(), coutput.c_str());
137
138
    }
138
139
 
139
140
  if ( return_variable.size() > 0 )
140
141
    {
141
142
    char buffer[100];
142
143
    sprintf(buffer, "%d", retVal);
143
 
    m_Makefile->AddDefinition(return_variable.c_str(), buffer);
 
144
    this->Makefile->AddDefinition(return_variable.c_str(), buffer);
144
145
    }
145
146
  
146
147
  return true;