summaryrefslogtreecommitdiffstats
path: root/Source/cmFindProgramCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-03-14 18:34:37 (GMT)
committerBrad King <brad.king@kitware.com>2019-03-14 18:46:23 (GMT)
commit00c4ddf75eb4065ad099c921604df98257f5e59a (patch)
tree1ef4d7bd06a76711b33e5460a67199fb76805cf5 /Source/cmFindProgramCommand.cxx
parentbf02d625325535f485512eba307cff54c08bb257 (diff)
downloadCMake-00c4ddf75eb4065ad099c921604df98257f5e59a.zip
CMake-00c4ddf75eb4065ad099c921604df98257f5e59a.tar.gz
CMake-00c4ddf75eb4065ad099c921604df98257f5e59a.tar.bz2
find_program: Restore leading double slash on Windows network path
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
Diffstat (limited to 'Source/cmFindProgramCommand.cxx')
-rw-r--r--Source/cmFindProgramCommand.cxx2
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;