diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-16 13:35:32 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-16 13:35:32 (GMT) |
| commit | a4f0b01939ca7c69c1e31f017c6e87b642388252 (patch) | |
| tree | d89ce881010661abf4fa29151c541a90210a9717 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 2f1c3401ec132f0672c108a2312146f39e8f017b (diff) | |
| parent | 7f5ec9f109dc66bc22ac377a7fb57d9221aed56b (diff) | |
| download | CMake-a4f0b01939ca7c69c1e31f017c6e87b642388252.zip CMake-a4f0b01939ca7c69c1e31f017c6e87b642388252.tar.gz CMake-a4f0b01939ca7c69c1e31f017c6e87b642388252.tar.bz2 | |
Merge topic 'GetTargetDirectory-cmGeneratorTarget'
7f5ec9f1 cmLocalGenerator: Port GetTargetDirectory to cmGeneratorTarget.
06f56d3b cmLocalUnixMakefileGenerator3: Port AppendCleanCommand to cmGeneratorTarget.
c8f8f165 cmLocalUnixMakefileGenerator3: Port another API to cmGeneratorTarget.
9f299a12 cmLocalUnixMakefileGenerator3: Port API to cmGenertorTarget.
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 32e6077..de640a4 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -717,13 +717,11 @@ std::string cmGlobalNinjaGenerator::GetEditCacheCommand() const void cmGlobalNinjaGenerator ::ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const { - cmTarget* target = gt->Target; - // Compute full path to object file directory for this target. std::string dir; dir += gt->Makefile->GetCurrentBinaryDirectory(); dir += "/"; - dir += gt->LocalGenerator->GetTargetDirectory(*target); + dir += gt->LocalGenerator->GetTargetDirectory(gt); dir += "/"; gt->ObjectDirectory = dir; } |