diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-29 13:36:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-29 13:36:55 (GMT) |
| commit | bbc358c3fc1f09fe2a483996ae1359dba3f587f4 (patch) | |
| tree | acbe60addb92ac90fc7c91f187a9d9226c2a95dd /Source/cmExecProgramCommand.cxx | |
| parent | 0cce556b5fbe629dccee294aeece7c275343ed64 (diff) | |
| parent | c51d07d4397ceed55c534a036ef81df44b741ff6 (diff) | |
| download | CMake-bbc358c3fc1f09fe2a483996ae1359dba3f587f4.zip CMake-bbc358c3fc1f09fe2a483996ae1359dba3f587f4.tar.gz CMake-bbc358c3fc1f09fe2a483996ae1359dba3f587f4.tar.bz2 | |
Merge branch 'master' into osx-init-early
Resolve conflict in Source/cmGlobalGenerator.cxx by integrating
changes from both sides.
Diffstat (limited to 'Source/cmExecProgramCommand.cxx')
| -rw-r--r-- | Source/cmExecProgramCommand.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmExecProgramCommand.cxx b/Source/cmExecProgramCommand.cxx index 6c11345..9b59088 100644 --- a/Source/cmExecProgramCommand.cxx +++ b/Source/cmExecProgramCommand.cxx @@ -132,14 +132,14 @@ bool cmExecProgramCommand } std::string coutput = std::string(output, first, last-first+1); - this->Makefile->AddDefinition(output_variable.c_str(), coutput.c_str()); + this->Makefile->AddDefinition(output_variable, coutput.c_str()); } if ( return_variable.size() > 0 ) { char buffer[100]; sprintf(buffer, "%d", retVal); - this->Makefile->AddDefinition(return_variable.c_str(), buffer); + this->Makefile->AddDefinition(return_variable, buffer); } return true; |