summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-05-16 05:30:33 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-05-19 20:36:49 (GMT)
commit8ab1cce7047b637f504b4b83cecc104e5cd1adc5 (patch)
tree95e05e056f4e4a0f7d6415f1b0e56d4188043a43
parent2dd5d42f5254abda64009434f0b11a47ca16640e (diff)
downloadCMake-8ab1cce7047b637f504b4b83cecc104e5cd1adc5.zip
CMake-8ab1cce7047b637f504b4b83cecc104e5cd1adc5.tar.gz
CMake-8ab1cce7047b637f504b4b83cecc104e5cd1adc5.tar.bz2
cmMakefile: Rename method to something more appropriate.
Allow the name to be used for something more-suitable.
-rw-r--r--Source/cmMakefile.cxx2
-rw-r--r--Source/cmMakefile.h2
-rw-r--r--Source/cmTryRunCommand.cxx2
-rw-r--r--Source/cmakemain.cxx2
4 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 016425e..c1bbd12 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4362,7 +4362,7 @@ void cmMakefile::AddCMakeDependFilesFromUser()
}
}
-std::string cmMakefile::GetListFileStack() const
+std::string cmMakefile::FormatListFileStack() const
{
std::ostringstream tmp;
size_t depth = this->ListFileStack.size();
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8c50e8e..72d8ec6 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -575,7 +575,7 @@ public:
{ this->ListFiles.push_back(file);}
void AddCMakeDependFilesFromUser();
- std::string GetListFileStack() const;
+ std::string FormatListFileStack() const;
/**
* Get the current context backtrace.
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx
index 3cd92cb..b9ffe5e 100644
--- a/Source/cmTryRunCommand.cxx
+++ b/Source/cmTryRunCommand.cxx
@@ -375,7 +375,7 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs,
comment += "Run arguments : ";
comment += runArgs;
comment += "\n";
- comment += " Called from: " + this->Makefile->GetListFileStack();
+ comment += " Called from: " + this->Makefile->FormatListFileStack();
cmsys::SystemTools::ReplaceString(comment, "\n", "\n# ");
file << comment << "\n\n";
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index 577dcd9..e5f4700 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -130,7 +130,7 @@ static std::string cmakemainGetStack(void *clientdata)
cmMakefile* mf=cmakemainGetMakefile(clientdata);
if (mf)
{
- msg = mf->GetListFileStack();
+ msg = mf->FormatListFileStack();
if (!msg.empty())
{
msg = "\n Called from: " + msg;