diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-04 20:56:32 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-06 18:02:10 (GMT) |
| commit | 20e62f74c5a030a25fe1c3a6c835d67eea152d8f (patch) | |
| tree | 8b6d869534acbd674cfb6794f02887b72a917a9d /Source/cmCommonTargetGenerator.cxx | |
| parent | fd93b3605bc931b5ce2386816973e106fa1ec646 (diff) | |
| download | CMake-20e62f74c5a030a25fe1c3a6c835d67eea152d8f.zip CMake-20e62f74c5a030a25fe1c3a6c835d67eea152d8f.tar.gz CMake-20e62f74c5a030a25fe1c3a6c835d67eea152d8f.tar.bz2 | |
cmLocalGenerator: Simplify ConvertToLinkReference
Make conversion to output format the caller responsibility, so that the
method only 'converts to a link reference'.
Diffstat (limited to 'Source/cmCommonTargetGenerator.cxx')
| -rw-r--r-- | Source/cmCommonTargetGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmCommonTargetGenerator.cxx b/Source/cmCommonTargetGenerator.cxx index 6887a31..14ea1a9 100644 --- a/Source/cmCommonTargetGenerator.cxx +++ b/Source/cmCommonTargetGenerator.cxx @@ -75,8 +75,10 @@ void cmCommonTargetGenerator::AddModuleDefinitionFlag(std::string& flags) // Append the flag and value. Use ConvertToLinkReference to help // vs6's "cl -link" pass it to the linker. std::string flag = defFileFlag; - flag += (this->LocalGenerator->ConvertToLinkReference( - this->ModuleDefinitionFile->GetFullPath())); + flag += this->LocalGenerator->ConvertToOutputFormat( + this->LocalGenerator->ConvertToLinkReference( + this->ModuleDefinitionFile->GetFullPath()), + cmOutputConverter::SHELL); this->LocalGenerator->AppendFlags(flags, flag); } |