diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-22 16:51:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-22 16:51:55 (GMT) |
| commit | e4e76f286c2eb5cfa822f89145611d02dc9d39b3 (patch) | |
| tree | 093670c695c30e0836fc24eb32365d8de7f89e30 /Source/cmExecProgramCommand.cxx | |
| parent | 149ce5db5ed52855514e3ee3eef45295e667eed4 (diff) | |
| parent | ede0419a376cd3ddc26058f910318c76e0077bb1 (diff) | |
| download | CMake-e4e76f286c2eb5cfa822f89145611d02dc9d39b3.zip CMake-e4e76f286c2eb5cfa822f89145611d02dc9d39b3.tar.gz CMake-e4e76f286c2eb5cfa822f89145611d02dc9d39b3.tar.bz2 | |
Merge branch 'master' into osx-CFBundle-info-plist
Resolve conflict in Source/cmOSXBundleGenerator.cxx by taking
the side from 'master'.
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; |