diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-15 14:20:06 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-15 14:21:35 (GMT) |
| commit | 0db702c7024a507f5c2ab67522d1d2a7699df611 (patch) | |
| tree | 63fa2496229c19767fcba9a7839f583e0a1ffaba /Source | |
| parent | f739654ddf3b628660e1a1550ba570061d909f02 (diff) | |
| parent | 00c4ddf75eb4065ad099c921604df98257f5e59a (diff) | |
| download | CMake-0db702c7024a507f5c2ab67522d1d2a7699df611.zip CMake-0db702c7024a507f5c2ab67522d1d2a7699df611.tar.gz CMake-0db702c7024a507f5c2ab67522d1d2a7699df611.tar.bz2 | |
Merge topic 'find_program-windows-share'
00c4ddf75e find_program: Restore leading double slash on Windows network path
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3105
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmFindProgramCommand.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmFindProgramCommand.cxx b/Source/cmFindProgramCommand.cxx index db34077..782f746 100644 --- a/Source/cmFindProgramCommand.cxx +++ b/Source/cmFindProgramCommand.cxx @@ -77,7 +77,7 @@ struct cmFindProgramHelper this->TestNameExt = name; this->TestNameExt += ext; this->TestPath = - cmSystemTools::CollapseCombinedPath(path, this->TestNameExt); + cmSystemTools::CollapseFullPath(this->TestNameExt, path); if (cmSystemTools::FileExists(this->TestPath, true)) { this->BestPath = this->TestPath; |