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/cmSourceFileLocation.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/cmSourceFileLocation.cxx')
| -rw-r--r-- | Source/cmSourceFileLocation.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx index d88a5f2530..a0eba5e5d1 100644 --- a/Source/cmSourceFileLocation.cxx +++ b/Source/cmSourceFileLocation.cxx @@ -106,7 +106,7 @@ void cmSourceFileLocation::DirectoryUseBinary() { this->Directory = cmSystemTools::CollapseFullPath( - this->Directory, this->Makefile->GetCurrentOutputDirectory()); + this->Directory, this->Makefile->GetCurrentBinaryDirectory()); this->AmbiguousDirectory = false; } } @@ -285,7 +285,7 @@ bool cmSourceFileLocation::Matches(cmSourceFileLocation const& loc) this->Directory, this->Makefile->GetCurrentSourceDirectory()); std::string const& binDir = cmSystemTools::CollapseFullPath( - this->Directory, this->Makefile->GetCurrentOutputDirectory()); + this->Directory, this->Makefile->GetCurrentBinaryDirectory()); if(srcDir != loc.Directory && binDir != loc.Directory) { @@ -300,7 +300,7 @@ bool cmSourceFileLocation::Matches(cmSourceFileLocation const& loc) loc.Directory, loc.Makefile->GetCurrentSourceDirectory()); std::string const& binDir = cmSystemTools::CollapseFullPath( - loc.Directory, loc.Makefile->GetCurrentOutputDirectory()); + loc.Directory, loc.Makefile->GetCurrentBinaryDirectory()); if(srcDir != this->Directory && binDir != this->Directory) { |