summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-04-16 18:06:54 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-04-20 22:15:20 (GMT)
commit32b8f03acc0357121ec8f2b96599d5eeaf38c0b4 (patch)
treea49a10b084858882573ce83bb0e2db5bc2cea9f3 /Source/cmMakefile.cxx
parent54d6a9187f24bbff9e344d8aa6b3c0d66167094d (diff)
downloadCMake-32b8f03acc0357121ec8f2b96599d5eeaf38c0b4.zip
CMake-32b8f03acc0357121ec8f2b96599d5eeaf38c0b4.tar.gz
CMake-32b8f03acc0357121ec8f2b96599d5eeaf38c0b4.tar.bz2
cmMakefile: Port users of GetStart* methods to new names.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 251e840..5ab30fc 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1236,7 +1236,7 @@ cmMakefile::AddUtilityCommand(const std::string& utilityName,
// Store the custom command in the target.
if (!commandLines.empty() || !depends.empty())
{
- std::string force = this->GetStartOutputDirectory();
+ std::string force = this->GetCurrentBinaryDirectory();
force += cmake::GetCMakeFilesDirectory();
force += "/";
force += utilityName;
@@ -1862,7 +1862,7 @@ void cmMakefile::CheckForUnused(const char* reason,
}
else
{
- path = this->GetStartDirectory();
+ path = this->GetCurrentSourceDirectory();
path += "/CMakeLists.txt";
cmListFileContext lfc;
lfc.FilePath = path;
@@ -4040,7 +4040,7 @@ void cmMakefile::SetProperty(const std::string& prop, const char* value)
{
// This property is not inherrited
if ( strcmp(this->GetCurrentSourceDirectory(),
- this->GetStartDirectory()) != 0 )
+ this->GetCurrentSourceDirectory()) != 0 )
{
return;
}
@@ -4104,7 +4104,7 @@ const char *cmMakefile::GetProperty(const std::string& prop,
{
if(cmLocalGenerator* plg = this->LocalGenerator->GetParent())
{
- output = plg->GetMakefile()->GetStartDirectory();
+ output = plg->GetMakefile()->GetCurrentSourceDirectory();
}
return output.c_str();
}