diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-09 20:27:46 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-14 22:33:12 (GMT) |
| commit | 7f5ec9f109dc66bc22ac377a7fb57d9221aed56b (patch) | |
| tree | 0adc08136e41c577aa436b4ce056a39fd5540fdb /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | 06f56d3bf5d8210d190e1bfcf05673ceb78c5594 (diff) | |
| download | CMake-7f5ec9f109dc66bc22ac377a7fb57d9221aed56b.zip CMake-7f5ec9f109dc66bc22ac377a7fb57d9221aed56b.tar.gz CMake-7f5ec9f109dc66bc22ac377a7fb57d9221aed56b.tar.bz2 | |
cmLocalGenerator: Port GetTargetDirectory to cmGeneratorTarget.
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 2e7a134..36602d8 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -191,7 +191,7 @@ GetLocalObjectFiles(std::map<std::string, LocalObjectInfo> &localObjectFiles) std::string dir; dir += gt->Makefile->GetCurrentBinaryDirectory(); dir += "/"; - dir += this->GetTargetDirectory(*gt->Target); + dir += this->GetTargetDirectory(gt); dir += "/"; // Compute the name of each object file. for(std::vector<cmSourceFile const*>::iterator @@ -936,7 +936,7 @@ cmLocalUnixMakefileGenerator3 ::GetRelativeTargetDirectory(cmGeneratorTarget* target) { std::string dir = this->HomeRelativeOutputPath; - dir += this->GetTargetDirectory(*target->Target); + dir += this->GetTargetDirectory(target); return this->Convert(dir,NONE,UNCHANGED); } @@ -1222,7 +1222,7 @@ cmLocalUnixMakefileGenerator3 { std::string cleanfile = this->Makefile->GetCurrentBinaryDirectory(); cleanfile += "/"; - cleanfile += this->GetTargetDirectory(target->Target); + cleanfile += this->GetTargetDirectory(target); cleanfile += "/cmake_clean"; if(filename) { @@ -1261,7 +1261,7 @@ cmLocalUnixMakefileGenerator3 fout << "\n" << "# Per-language clean rules from dependency scanning.\n" << "foreach(lang " << cmJoin(languages, " ") << ")\n" - << " include(" << this->GetTargetDirectory(target->Target) + << " include(" << this->GetTargetDirectory(target) << "/cmake_clean_${lang}.cmake OPTIONAL)\n" << "endforeach()\n"; } @@ -2282,10 +2282,10 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p, //---------------------------------------------------------------------------- std::string cmLocalUnixMakefileGenerator3 -::GetTargetDirectory(cmTarget const& target) const +::GetTargetDirectory(cmGeneratorTarget const* target) const { std::string dir = cmake::GetCMakeFilesDirectoryPostSlash(); - dir += target.GetName(); + dir += target->GetName(); #if defined(__VMS) dir += "_dir"; #else |