diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-08-27 11:44:57 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-08-27 13:41:17 (GMT) |
| commit | 58ba87f892316b9f9cbb7851a940ec808527e36a (patch) | |
| tree | aea9e1d7898e6d8baffc74b1ea6abd5937fb955a /Source/cmLocalGenerator.cxx | |
| parent | e80314d7a8208214ac85bf9b2e769a7e3b5aaa04 (diff) | |
| download | CMake-58ba87f892316b9f9cbb7851a940ec808527e36a.zip CMake-58ba87f892316b9f9cbb7851a940ec808527e36a.tar.gz CMake-58ba87f892316b9f9cbb7851a940ec808527e36a.tar.bz2 | |
Convert: Replace Convert(FULL) with equivalent
This is more explicit than funnelling everything through the Convert
method.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 2fa3f86..de9e1e5 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -688,7 +688,9 @@ std::string cmLocalGenerator::ExpandRuleVariable( } } if (variable == "CMAKE_COMMAND") { - return this->Convert(cmSystemTools::GetCMakeCommand(), FULL, SHELL); + return this->ConvertToOutputFormat( + cmSystemTools::CollapseFullPath(cmSystemTools::GetCMakeCommand()), + SHELL); } std::vector<std::string> enabledLanguages = this->GetState()->GetEnabledLanguages(); @@ -1183,7 +1185,8 @@ void cmLocalGenerator::GetTargetFlags( if (sf->GetExtension() == "def") { linkFlags += this->Makefile->GetSafeDefinition("CMAKE_LINK_DEF_FILE_FLAG"); - linkFlags += this->Convert(sf->GetFullPath(), FULL, SHELL); + linkFlags += this->ConvertToOutputFormat( + cmSystemTools::CollapseFullPath(sf->GetFullPath()), SHELL); linkFlags += " "; } } |