diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-14 18:52:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-03-14 18:52:12 (GMT) |
| commit | 5b6c6c2d80c6dee20b84dbec64e42ce2d426d33e (patch) | |
| tree | 07070996413491fa686a148470073d50fe88c56e /Source | |
| parent | 0e652f2defb3ebb700a39fd2d2e1bdd8605ca5b4 (diff) | |
| parent | 00c4ddf75eb4065ad099c921604df98257f5e59a (diff) | |
| download | CMake-5b6c6c2d80c6dee20b84dbec64e42ce2d426d33e.zip CMake-5b6c6c2d80c6dee20b84dbec64e42ce2d426d33e.tar.gz CMake-5b6c6c2d80c6dee20b84dbec64e42ce2d426d33e.tar.bz2 | |
Merge branch 'find_program-windows-share' into release-3.14
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; |