diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-16 19:33:09 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-20 22:12:52 (GMT) |
| commit | 54d6a9187f24bbff9e344d8aa6b3c0d66167094d (patch) | |
| tree | 38e6b82b92d62335a89cdc5b59835cc94c33f052 /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | 55d80d0a8557189400bc12c5e577702a4d03b2e6 (diff) | |
| download | CMake-54d6a9187f24bbff9e344d8aa6b3c0d66167094d.zip CMake-54d6a9187f24bbff9e344d8aa6b3c0d66167094d.tar.gz CMake-54d6a9187f24bbff9e344d8aa6b3c0d66167094d.tar.bz2 | |
cmMakefile: Rename GetCurrent{Output,Binary}Directory.
Match names used in CMake code.
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 153ed09..eb0f7bf 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -205,7 +205,7 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles) ->GetSafeDefinition("CMAKE_BUILD_TYPE")); // Compute full path to object file directory for this target. std::string dir; - dir += gt->Makefile->GetCurrentOutputDirectory(); + dir += gt->Makefile->GetCurrentBinaryDirectory(); dir += "/"; dir += this->GetTargetDirectory(*gt->Target); dir += "/"; @@ -1236,7 +1236,7 @@ cmLocalUnixMakefileGenerator3 const std::vector<std::string>& files, cmTarget& target, const char* filename) { - std::string cleanfile = this->Makefile->GetCurrentOutputDirectory(); + std::string cleanfile = this->Makefile->GetCurrentBinaryDirectory(); cleanfile += "/"; cleanfile += this->GetTargetDirectory(target); cleanfile += "/cmake_clean"; |