diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-18 18:20:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-03-24 14:10:06 (GMT) |
| commit | 12b39aef7599a3ab6b1c1b9537d427839a9346b3 (patch) | |
| tree | 36ccbd9854b82dd3c7aa25c4eb3f9a1ac6365916 /Source/cmGlobalUnixMakefileGenerator3.cxx | |
| parent | c98ec3692ea2a98edb6c7c26ffc2e0d12863df99 (diff) | |
| download | CMake-12b39aef7599a3ab6b1c1b9537d427839a9346b3.zip CMake-12b39aef7599a3ab6b1c1b9537d427839a9346b3.tar.gz CMake-12b39aef7599a3ab6b1c1b9537d427839a9346b3.tar.bz2 | |
Remove redundant calls to CollapseFullPath
Remove calls where it is known the input is already a collapsed
full path.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 7daca74..e213023 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -697,9 +697,8 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2( std::ostringstream progCmd; progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # in target - progCmd << lg.ConvertToOutputFormat( - cmSystemTools::CollapseFullPath(progress.Dir), - cmOutputConverter::SHELL); + progCmd << lg.ConvertToOutputFormat(progress.Dir, + cmOutputConverter::SHELL); // std::set<cmGeneratorTarget const*> emitted; progCmd << " " @@ -711,9 +710,8 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2( { std::ostringstream progCmd; progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # 0 - progCmd << lg.ConvertToOutputFormat( - cmSystemTools::CollapseFullPath(progress.Dir), - cmOutputConverter::SHELL); + progCmd << lg.ConvertToOutputFormat(progress.Dir, + cmOutputConverter::SHELL); progCmd << " 0"; commands.push_back(progCmd.str()); } |