reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-25 04:29:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

find_program: Restore leading double slash on Windows network path

Browse Source 
Since commit c76c1ea208 (find_program: Consider CWD only for paths with
separator, 2018-05-31, v3.13.0-rc1~413^2) we accidentally convert the
leading `//` to just `/` on results with Windows network paths.

This was caused by `CollapseCombinedPath` being less robust than
`CollapseFullPath`.  Restore use of the latter but in a way that
preserves the requirement of the above commit to support candidates that
are themselves absolute.

Fixes: #19049
Issue: #19050
This commit is contained in:
Brad King 2019-03-14 14:34:37 -04:00
parent bf02d62532
commit 00c4ddf75e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmFindProgramCommand.cxx
View File

@ -77,7 +77,7 @@ struct cmFindProgramHelper
this->TestNameExt = name; this->TestNameExt = name;
this->TestNameExt += ext; this->TestNameExt += ext;
this->TestPath = this->TestPath =
cmSystemTools::CollapseCombinedPath(path, this->TestNameExt); cmSystemTools::CollapseFullPath(this->TestNameExt, path);
if (cmSystemTools::FileExists(this->TestPath, true)) { if (cmSystemTools::FileExists(this->TestPath, true)) {
this->BestPath = this->TestPath; this->BestPath = this->TestPath;