diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-04-16 21:33:09 +0200 |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-04-21 00:12:52 +0200 |
commit | 54d6a9187f24bbff9e344d8aa6b3c0d66167094d (patch) | |
tree | 38e6b82b92d62335a89cdc5b59835cc94c33f052 /Source/cmFileCommand.cxx | |
parent | 55d80d0a8557189400bc12c5e577702a4d03b2e6 (diff) | |
download | cmake-54d6a9187f24bbff9e344d8aa6b3c0d66167094d.tar.gz |
cmMakefile: Rename GetCurrent{Output,Binary}Directory.
Match names used in CMake code.
Diffstat (limited to 'Source/cmFileCommand.cxx')
-rw-r--r-- | Source/cmFileCommand.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index a0ba88572d..14f397ce4e 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -645,7 +645,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args) if (hex_conversion_enabled) { // TODO: should work without temp file, but just on a memory buffer - std::string binaryFileName = this->Makefile->GetCurrentOutputDirectory(); + std::string binaryFileName = this->Makefile->GetCurrentBinaryDirectory(); binaryFileName += cmake::GetCMakeFilesDirectory(); binaryFileName += "/FileCommandStringsBinaryFile"; if(cmHexFileConverter::TryConvert(fileName.c_str(),binaryFileName.c_str())) @@ -1568,7 +1568,7 @@ bool cmFileCopier::CheckValue(std::string const& arg) } else { - this->Destination = this->Makefile->GetCurrentOutputDirectory(); + this->Destination = this->Makefile->GetCurrentBinaryDirectory(); this->Destination += "/" + arg; } this->Doing = DoingNone; |