diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-29 14:17:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-29 14:18:42 (GMT) |
| commit | 60c06620a690f0cbeeaa3fba762e19cd031669ca (patch) | |
| tree | c72e5f4bd45dc2a769e0c7f7bcbbfbd108f0e0f7 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 90ac5e6384735deb0ac523684010b2f4701d4f4d (diff) | |
| parent | b6a957c9696706a338cdeef63540bf8a4c42d22d (diff) | |
| download | CMake-60c06620a690f0cbeeaa3fba762e19cd031669ca.zip CMake-60c06620a690f0cbeeaa3fba762e19cd031669ca.tar.gz CMake-60c06620a690f0cbeeaa3fba762e19cd031669ca.tar.bz2 | |
Merge topic 'cmoutputconverter-simplify'
b6a957c969 cmOutputConverter: move ConvertToRelativePath to cmStateDirectory.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2831
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(), '/', '\\'); |