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/cmGlobalUnixMakefileGenerator3.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/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index bbc794d..77fbbe9 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -723,8 +723,9 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2( std::ostringstream progCmd; progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # in target - progCmd << lg->Convert(progress.Dir, cmOutputConverter::FULL, - cmOutputConverter::SHELL); + progCmd << lg->ConvertToOutputFormat( + cmSystemTools::CollapseFullPath(progress.Dir), + cmOutputConverter::SHELL); // std::set<cmGeneratorTarget const*> emitted; progCmd << " " << this->CountProgressMarksInTarget(gtarget, emitted); @@ -736,8 +737,9 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2( { std::ostringstream progCmd; progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # 0 - progCmd << lg->Convert(progress.Dir, cmOutputConverter::FULL, - cmOutputConverter::SHELL); + progCmd << lg->ConvertToOutputFormat( + cmSystemTools::CollapseFullPath(progress.Dir), + cmOutputConverter::SHELL); progCmd << " 0"; commands.push_back(progCmd.str()); } |