Prechádzať zdrojové kódy

Merge branch 'find_program-windows-share' into release-3.14

Merge-request: !3105
Brad King 6 rokov pred
rodič
commit
5b6c6c2d80
1 zmenil súbory, kde vykonal 1 pridanie a 1 odobranie
  1. 1 1
      Source/cmFindProgramCommand.cxx

+ 1 - 1
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;