diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-21 17:59:12 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-24 07:19:53 (GMT) |
| commit | 4c41e74da58b6f1057466e7eaa22942dc62c8802 (patch) | |
| tree | ab7a818a41af9a6d3788c3cca3760ca24b758c63 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 67b2f4312c431eb363dd94a2bb5d88cc6c8a7c95 (diff) | |
| download | CMake-4c41e74da58b6f1057466e7eaa22942dc62c8802.zip CMake-4c41e74da58b6f1057466e7eaa22942dc62c8802.tar.gz CMake-4c41e74da58b6f1057466e7eaa22942dc62c8802.tar.bz2 | |
Use cmLocalGenerator at generate-time.
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 89a6dff..6e650ce 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -719,7 +719,7 @@ void cmGlobalNinjaGenerator { // Compute full path to object file directory for this target. std::string dir; - dir += gt->Makefile->GetCurrentBinaryDirectory(); + dir += gt->LocalGenerator->GetCurrentBinaryDirectory(); dir += "/"; dir += gt->LocalGenerator->GetTargetDirectory(gt); dir += "/"; @@ -938,7 +938,7 @@ cmGlobalNinjaGenerator case cmState::OBJECT_LIBRARY: case cmState::UTILITY: { std::string path = this->ConvertToNinjaPath( - target->GetMakefile()->GetCurrentBinaryDirectory()); + target->GetLocalGenerator()->GetCurrentBinaryDirectory()); if (path.empty() || path == ".") outputs.push_back(target->GetName()); else { |