diff options
author | Nicolas Despres <nicolas.despres@gmail.com> | 2016-05-13 23:18:20 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-17 13:34:11 (GMT) |
commit | 038e7716e58e4cf79bda6ba72b92814a14978a8f (patch) | |
tree | 05a417720ba732cc8beb2210f010835ffc6dd4e8 /Source/cmLocalNinjaGenerator.cxx | |
parent | 7c26a6a269b0c12ecdf7605183d9fa26ad2b91eb (diff) | |
download | CMake-038e7716e58e4cf79bda6ba72b92814a14978a8f.zip CMake-038e7716e58e4cf79bda6ba72b92814a14978a8f.tar.gz CMake-038e7716e58e4cf79bda6ba72b92814a14978a8f.tar.bz2 |
Ninja: Pass all build paths through a central method
This gives us a central location to revise paths.
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
-rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 69f8fe5..c7e1a90f8 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -225,8 +225,13 @@ void cmLocalNinjaGenerator::WriteNinjaFilesInclusion(std::ostream& os) cmGlobalNinjaGenerator::WriteDivider(os); os << "# Include auxiliary files.\n" << "\n"; - cmGlobalNinjaGenerator::WriteInclude( - os, cmGlobalNinjaGenerator::NINJA_RULES_FILE, "Include rules file."); + cmGlobalNinjaGenerator* ng = this->GetGlobalNinjaGenerator(); + std::string const ninjaRulesFile = + ng->NinjaOutputPath(cmGlobalNinjaGenerator::NINJA_RULES_FILE); + std::string const rulesFilePath = + ng->EncodeIdent(ng->EncodePath(ninjaRulesFile), os); + cmGlobalNinjaGenerator::WriteInclude(os, rulesFilePath, + "Include rules file."); os << "\n"; } |