From 2f69c0233cec7dc64053813c20cc83d306247594 Mon Sep 17 00:00:00 2001 From: Alex Turbov Date: Tue, 5 Jul 2022 05:14:18 +0400 Subject: cmFindPackageCommand: Optimize the last calls to `TryGeneratedPaths` --- Source/cmFindPackageCommand.cxx | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index f10b097..f260ec7 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -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)/ - if (TryGeneratedPaths(searchFn, prefix, firstPkgDirGen, cmnGen, - secondPkgDirGen, iCMakeGen)) { - return true; - } - - return false; + return TryGeneratedPaths(searchFn, prefix, firstPkgDirGen, cmnGen, + secondPkgDirGen, iCMakeGen); } bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in) @@ -2621,11 +2617,7 @@ bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in) } // /Foo.framework/Versions/*/Resources/CMake/ - if (TryGeneratedPaths(searchFn, prefix, fwGen, vGen, grGen, iCMakeGen)) { - return true; - } - - return false; + return TryGeneratedPaths(searchFn, prefix, fwGen, vGen, grGen, iCMakeGen); } bool cmFindPackageCommand::SearchAppBundlePrefix(std::string const& prefix_in) @@ -2649,13 +2641,9 @@ bool cmFindPackageCommand::SearchAppBundlePrefix(std::string const& prefix_in) } // /Foo.app/Contents/Resources/CMake - if (TryGeneratedPaths( - searchFn, prefix, appGen, crGen, - cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) { - return true; - } - - return false; + return TryGeneratedPaths( + searchFn, prefix, appGen, crGen, + cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s }); } // TODO: Debug cmsys::Glob double slash problem. -- cgit v0.12