diff options
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 8 |
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(); } |