kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Nicolas Despres 2016-05-14 01:18:20 +02:00 committed by Brad King
parent 0397c92a15
commit d4381cb15d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmLocalNinjaGenerator.cxx
View File

@ -123,7 +123,8 @@ cmGlobalNinjaGenerator* cmLocalNinjaGenerator::GetGlobalNinjaGenerator()
std::string cmLocalNinjaGenerator::ConvertToLinkReference( std::string cmLocalNinjaGenerator::ConvertToLinkReference(
std::string const& lib, OutputFormat format) 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( std::string cmLocalNinjaGenerator::ConvertToIncludeReference(