diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-16 19:17:41 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-20 22:12:52 (GMT) |
| commit | 55d80d0a8557189400bc12c5e577702a4d03b2e6 (patch) | |
| tree | f19e6c57f469cc0ded33f382b0bee47369265c13 /Source/cmSourceFileLocation.cxx | |
| parent | b23cf06f861e928cf8ee942eabd24ea76e299f4f (diff) | |
| download | CMake-55d80d0a8557189400bc12c5e577702a4d03b2e6.zip CMake-55d80d0a8557189400bc12c5e577702a4d03b2e6.tar.gz CMake-55d80d0a8557189400bc12c5e577702a4d03b2e6.tar.bz2 | |
cmMakefile: Rename GetCurrent{,Source}Directory.
Match the names used in cmake code.
Diffstat (limited to 'Source/cmSourceFileLocation.cxx')
| -rw-r--r-- | Source/cmSourceFileLocation.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx index 9d67c1e..d88a5f2 100644 --- a/Source/cmSourceFileLocation.cxx +++ b/Source/cmSourceFileLocation.cxx @@ -93,7 +93,7 @@ void cmSourceFileLocation::DirectoryUseSource() { this->Directory = cmSystemTools::CollapseFullPath( - this->Directory, this->Makefile->GetCurrentDirectory()); + this->Directory, this->Makefile->GetCurrentSourceDirectory()); this->AmbiguousDirectory = false; } } @@ -143,7 +143,7 @@ void cmSourceFileLocation::UpdateExtension(const std::string& name) // Check the source tree only because a file in the build tree should // be specified by full path at least once. We do not want this // detection to depend on whether the project has already been built. - tryPath = this->Makefile->GetCurrentDirectory(); + tryPath = this->Makefile->GetCurrentSourceDirectory(); tryPath += "/"; } if(!this->Directory.empty()) @@ -282,7 +282,7 @@ bool cmSourceFileLocation::Matches(cmSourceFileLocation const& loc) // Compare possible directory combinations. std::string const& srcDir = cmSystemTools::CollapseFullPath( - this->Directory, this->Makefile->GetCurrentDirectory()); + this->Directory, this->Makefile->GetCurrentSourceDirectory()); std::string const& binDir = cmSystemTools::CollapseFullPath( this->Directory, this->Makefile->GetCurrentOutputDirectory()); @@ -297,7 +297,7 @@ bool cmSourceFileLocation::Matches(cmSourceFileLocation const& loc) // Compare possible directory combinations. std::string const& srcDir = cmSystemTools::CollapseFullPath( - loc.Directory, loc.Makefile->GetCurrentDirectory()); + loc.Directory, loc.Makefile->GetCurrentSourceDirectory()); std::string const& binDir = cmSystemTools::CollapseFullPath( loc.Directory, loc.Makefile->GetCurrentOutputDirectory()); |