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:09 (GMT) |
| commit | d4381cb15df3e81b78b6d8d9e7d9b727a616985d (patch) | |
| tree | f96ee1b65d1acbac4feffb8cca5edcedbe556742 /Source/cmLocalNinjaGenerator.cxx | |
| parent | 0397c92a15e505021d75eb0a156a312b024eb85e (diff) | |
| download | CMake-d4381cb15df3e81b78b6d8d9e7d9b727a616985d.zip CMake-d4381cb15df3e81b78b6d8d9e7d9b727a616985d.tar.gz CMake-d4381cb15df3e81b78b6d8d9e7d9b727a616985d.tar.bz2 | |
Ninja: Convert link library file names like all other output paths
All paths generated on Ninja-invoked command lines should be passed
through ConvertToNinjaPath. Fix ConvertToLinkReference to call this
instead of partially duplicating its implementation.
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 671d8a0..69f8fe5 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -123,7 +123,8 @@ cmGlobalNinjaGenerator* cmLocalNinjaGenerator::GetGlobalNinjaGenerator() std::string cmLocalNinjaGenerator::ConvertToLinkReference( std::string const& lib, OutputFormat format) { - return this->Convert(lib, HOME_OUTPUT, format); + std::string path = this->GetGlobalNinjaGenerator()->ConvertToNinjaPath(lib); + return this->ConvertToOutputFormat(path, format); } std::string cmLocalNinjaGenerator::ConvertToIncludeReference( |