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/cmAddSubDirectoryCommand.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/cmAddSubDirectoryCommand.cxx')
-rw-r--r-- | Source/cmAddSubDirectoryCommand.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmAddSubDirectoryCommand.cxx b/Source/cmAddSubDirectoryCommand.cxx index 9d55c1a..bae76d2 100644 --- a/Source/cmAddSubDirectoryCommand.cxx +++ b/Source/cmAddSubDirectoryCommand.cxx @@ -57,7 +57,7 @@ bool cmAddSubDirectoryCommand::InitialPass } else { - srcPath = this->Makefile->GetCurrentDirectory(); + srcPath = this->Makefile->GetCurrentSourceDirectory(); srcPath += "/"; srcPath += srcArg; } @@ -79,12 +79,12 @@ bool cmAddSubDirectoryCommand::InitialPass // not a subdirectory of the current directory then it is an // error. if(!cmSystemTools::IsSubDirectory(srcPath, - this->Makefile->GetCurrentDirectory())) + this->Makefile->GetCurrentSourceDirectory())) { std::ostringstream e; e << "not given a binary directory but the given source directory " << "\"" << srcPath << "\" is not a subdirectory of \"" - << this->Makefile->GetCurrentDirectory() << "\". " + << this->Makefile->GetCurrentSourceDirectory() << "\". " << "When specifying an out-of-tree source a binary directory " << "must be explicitly specified."; this->SetError(e.str()); @@ -93,7 +93,7 @@ bool cmAddSubDirectoryCommand::InitialPass // Remove the CurrentDirectory from the srcPath and replace it // with the CurrentOutputDirectory. - const char* src = this->Makefile->GetCurrentDirectory(); + const char* src = this->Makefile->GetCurrentSourceDirectory(); const char* bin = this->Makefile->GetCurrentOutputDirectory(); size_t srcLen = strlen(src); size_t binLen = strlen(bin); |