diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-08-27 11:44:56 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-08-27 13:26:37 (GMT) |
| commit | 563ac22a1646f1287d1baac755e13cbe33c1fe7b (patch) | |
| tree | d2f791c10703c3e89cc52ad5be566ec63fd9acc2 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 08be47cf939c3adfe653809c46c7b23b7a912a39 (diff) | |
| download | CMake-563ac22a1646f1287d1baac755e13cbe33c1fe7b.zip CMake-563ac22a1646f1287d1baac755e13cbe33c1fe7b.tar.gz CMake-563ac22a1646f1287d1baac755e13cbe33c1fe7b.tar.bz2 | |
Convert: Replace trivial conversion with new method
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 2b83479..939c5ad 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -747,7 +747,8 @@ std::string cmGlobalNinjaGenerator::ConvertToNinjaPath(const std::string& path) { cmLocalNinjaGenerator* ng = static_cast<cmLocalNinjaGenerator*>(this->LocalGenerators[0]); - std::string convPath = ng->Convert(path, cmOutputConverter::HOME_OUTPUT); + std::string convPath = + ng->ConvertToRelativePath(path, cmOutputConverter::HOME_OUTPUT); convPath = this->NinjaOutputPath(convPath); #ifdef _WIN32 std::replace(convPath.begin(), convPath.end(), '/', '\\'); @@ -760,7 +761,8 @@ std::string cmGlobalNinjaGenerator::ConvertToNinjaFolderRule( { cmLocalNinjaGenerator* ng = static_cast<cmLocalNinjaGenerator*>(this->LocalGenerators[0]); - std::string convPath = ng->Convert(path + "/all", cmOutputConverter::HOME); + std::string convPath = + ng->ConvertToRelativePath(path + "/all", cmOutputConverter::HOME); convPath = this->NinjaOutputPath(convPath); #ifdef _WIN32 std::replace(convPath.begin(), convPath.end(), '/', '\\'); |