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/cmMakefile.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/cmMakefile.cxx')
-rw-r--r-- | Source/cmMakefile.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 90a6410..251e840 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -269,7 +269,7 @@ void cmMakefile::IssueMessage(cmake::MessageType t, if(this->ListFileStack.empty()) { // We are not processing the project. Add the directory-level context. - lfc.FilePath = this->GetCurrentDirectory(); + lfc.FilePath = this->GetCurrentSourceDirectory(); lfc.FilePath += "/CMakeLists.txt"; } else @@ -1622,7 +1622,7 @@ void cmMakefile::ConfigureSubDirectory(cmLocalGenerator *lg2) if (this->GetCMakeInstance()->GetDebugOutput()) { std::string msg=" Entering "; - msg += lg2->GetMakefile()->GetCurrentDirectory(); + msg += lg2->GetMakefile()->GetCurrentSourceDirectory(); cmSystemTools::Message(msg.c_str()); } // finally configure the subdir @@ -1630,7 +1630,7 @@ void cmMakefile::ConfigureSubDirectory(cmLocalGenerator *lg2) if (this->GetCMakeInstance()->GetDebugOutput()) { std::string msg=" Returning to "; - msg += this->GetCurrentDirectory(); + msg += this->GetCurrentSourceDirectory(); cmSystemTools::Message(msg.c_str()); } } @@ -4039,7 +4039,7 @@ void cmMakefile::SetProperty(const std::string& prop, const char* value) if ( prop == "ADDITIONAL_MAKE_CLEAN_FILES" ) { // This property is not inherrited - if ( strcmp(this->GetCurrentDirectory(), + if ( strcmp(this->GetCurrentSourceDirectory(), this->GetStartDirectory()) != 0 ) { return; @@ -4307,7 +4307,7 @@ void cmMakefile::AddCMakeDependFilesFromUser() } else { - std::string f = this->GetCurrentDirectory(); + std::string f = this->GetCurrentSourceDirectory(); f += "/"; f += *i; this->AddCMakeDependFile(f); @@ -4588,7 +4588,7 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg, default: break; } e << "created in source directory \"" - << existing->GetMakefile()->GetCurrentDirectory() << "\". " + << existing->GetMakefile()->GetCurrentSourceDirectory() << "\". " << "See documentation for policy CMP0002 for more details."; msg = e.str(); return false; |