diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-16 18:06:54 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-20 22:15:20 (GMT) |
| commit | 32b8f03acc0357121ec8f2b96599d5eeaf38c0b4 (patch) | |
| tree | a49a10b084858882573ce83bb0e2db5bc2cea9f3 /Source/cmTarget.cxx | |
| parent | 54d6a9187f24bbff9e344d8aa6b3c0d66167094d (diff) | |
| download | CMake-32b8f03acc0357121ec8f2b96599d5eeaf38c0b4.zip CMake-32b8f03acc0357121ec8f2b96599d5eeaf38c0b4.tar.gz CMake-32b8f03acc0357121ec8f2b96599d5eeaf38c0b4.tar.bz2 | |
cmMakefile: Port users of GetStart* methods to new names.
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index cc6d748..f69e9ae 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -1918,8 +1918,8 @@ void cmTarget::AppendBuildInterfaceIncludes() if (this->Makefile->IsOn("CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE")) { - const char *binDir = this->Makefile->GetStartOutputDirectory(); - const char *srcDir = this->Makefile->GetStartDirectory(); + const char *binDir = this->Makefile->GetCurrentBinaryDirectory(); + const char *srcDir = this->Makefile->GetCurrentSourceDirectory(); const std::string dirs = std::string(binDir ? binDir : "") + std::string(binDir ? ";" : "") + std::string(srcDir ? srcDir : ""); @@ -4542,7 +4542,7 @@ bool cmTarget::ComputeOutputDir(const std::string& config, // specified as a relative path. Treat a relative path as // relative to the current output directory for this makefile. out = (cmSystemTools::CollapseFullPath - (out, this->Makefile->GetStartOutputDirectory())); + (out, this->Makefile->GetCurrentBinaryDirectory())); // The generator may add the configuration's subdirectory. if(!conf.empty()) @@ -4608,7 +4608,7 @@ bool cmTarget::ComputePDBOutputDir(const std::string& kind, // specified as a relative path. Treat a relative path as // relative to the current output directory for this makefile. out = (cmSystemTools::CollapseFullPath - (out, this->Makefile->GetStartOutputDirectory())); + (out, this->Makefile->GetCurrentBinaryDirectory())); // The generator may add the configuration's subdirectory. if(!conf.empty()) |