diff options
| author | Bruno Manganelli <bruno.manga95@gmail.com> | 2018-11-23 18:52:26 (GMT) |
|---|---|---|
| committer | Bruno Manganelli <bruno.manga95@gmail.com> | 2019-01-27 15:48:57 (GMT) |
| commit | b6a957c9696706a338cdeef63540bf8a4c42d22d (patch) | |
| tree | 48b0536c2d1ba352576910dcfb44490b75ffde92 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 05e4fa47738bf44e8ee6501b415df2899b10f6da (diff) | |
| download | CMake-b6a957c9696706a338cdeef63540bf8a4c42d22d.zip CMake-b6a957c9696706a338cdeef63540bf8a4c42d22d.tar.gz CMake-b6a957c9696706a338cdeef63540bf8a4c42d22d.tar.bz2 | |
cmOutputConverter: move ConvertToRelativePath to cmStateDirectory.
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 23dbd76..8f09566 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -861,7 +861,7 @@ std::string const& cmGlobalNinjaGenerator::ConvertToNinjaPath( cmLocalNinjaGenerator* ng = static_cast<cmLocalNinjaGenerator*>(this->LocalGenerators[0]); std::string const& bin_dir = ng->GetState()->GetBinaryDirectory(); - std::string convPath = ng->ConvertToRelativePath(bin_dir, path); + std::string convPath = ng->MaybeConvertToRelativePath(bin_dir, path); convPath = this->NinjaOutputPath(convPath); #ifdef _WIN32 std::replace(convPath.begin(), convPath.end(), '/', '\\'); |