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/cmMakefileTargetGenerator.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/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 0076caf..97982bf 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -495,7 +495,7 @@ void cmMakefileTargetGenerator this->WriteObjectBuildFile(obj, lang, source, depends); // The object file should be checked for dependency integrity. - std::string objFullPath = this->Makefile->GetCurrentOutputDirectory(); + std::string objFullPath = this->Makefile->GetCurrentBinaryDirectory(); objFullPath += "/"; objFullPath += obj; objFullPath = @@ -1968,7 +1968,7 @@ const char* cmMakefileTargetGenerator::GetFortranModuleDirectory() { // Interpret relative to the current output directory. this->FortranModuleDirectory = - this->Makefile->GetCurrentOutputDirectory(); + this->Makefile->GetCurrentBinaryDirectory(); this->FortranModuleDirectory += "/"; this->FortranModuleDirectory += target_mod_dir; } |