mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 04:09:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmFindPackageCommand: Optimize the last calls to TryGeneratedPaths

Browse Source
This commit is contained in:
Alex Turbov
2022-07-05 05:14:18 +04:00
committed by Brad King
parent 076a4b44b0
commit 2f69c0233c
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmFindPackageCommand.cxx
+6 -18
View File
@@ -2578,12 +2578,8 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
} }
// PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/(cmake|CMake)/ // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/(cmake|CMake)/
if (TryGeneratedPaths(searchFn, prefix, firstPkgDirGen, cmnGen, return TryGeneratedPaths(searchFn, prefix, firstPkgDirGen, cmnGen,
secondPkgDirGen, iCMakeGen)) { secondPkgDirGen, iCMakeGen);
return true;
}
return false;
} }
bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in) bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in)
@@ -2621,11 +2617,7 @@ bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in)
} }
// <prefix>/Foo.framework/Versions/*/Resources/CMake/ // <prefix>/Foo.framework/Versions/*/Resources/CMake/
if (TryGeneratedPaths(searchFn, prefix, fwGen, vGen, grGen, iCMakeGen)) { return TryGeneratedPaths(searchFn, prefix, fwGen, vGen, grGen, iCMakeGen);
return true;
}
return false;
} }
bool cmFindPackageCommand::SearchAppBundlePrefix(std::string const& prefix_in) bool cmFindPackageCommand::SearchAppBundlePrefix(std::string const& prefix_in)
@@ -2649,13 +2641,9 @@ bool cmFindPackageCommand::SearchAppBundlePrefix(std::string const& prefix_in)
} }
// <prefix>/Foo.app/Contents/Resources/CMake // <prefix>/Foo.app/Contents/Resources/CMake
if (TryGeneratedPaths( return TryGeneratedPaths(
searchFn, prefix, appGen, crGen, searchFn, prefix, appGen, crGen,
cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) { cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s });
return true;
}
return false;
} }
// TODO: Debug cmsys::Glob double slash problem. // TODO: Debug cmsys::Glob double slash problem.