From a08160685531d926774d4c994dbc76845e254aed Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 4 Jul 2022 05:45:23 +0400
Subject: Tests: Add more find_package search path cases

---
 Tests/RunCMake/find_package/RunCMakeTest.cmake           | 16 ++++++++++++++++
 Tests/RunCMake/find_package/SearchPaths.cmake            |  2 ++
 .../SearchPaths/prefix/SearchPathsConfig.cmake           |  0
 .../prefix_cmake/cmake/SearchPathsConfig.cmake           |  0
 .../lib/cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake  |  0
 .../lib/SearchPaths-1.2.3/SearchPathsConfig.cmake        |  0
 .../lib/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake  |  0
 .../prefix_pkg/SearchPaths-1.2.3/SearchPathsConfig.cmake |  0
 .../SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake      |  0
 .../lib/cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake  |  0
 .../lib/SearchPaths-1.2.3/SearchPathsConfig.cmake        |  0
 .../lib/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake  |  0
 .../cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake      |  0
 .../share/SearchPaths-1.2.3/SearchPathsConfig.cmake      |  0
 .../SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake      |  0
 .../cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake      |  0
 .../share/SearchPaths-1.2.3/SearchPathsConfig.cmake      |  0
 .../SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake      |  0
 .../RunCMake/find_package/SearchPaths_prefix-stderr.txt  | 10 ++++++++++
 Tests/RunCMake/find_package/SearchPaths_prefix.cmake     |  1 +
 .../find_package/SearchPaths_prefix_cmake-stderr.txt     | 12 ++++++++++++
 .../RunCMake/find_package/SearchPaths_prefix_cmake.cmake |  1 +
 .../SearchPaths_prefix_lib_cmake_pkg-stderr.txt          | 12 ++++++++++++
 .../find_package/SearchPaths_prefix_lib_cmake_pkg.cmake  |  1 +
 .../find_package/SearchPaths_prefix_lib_pkg-stderr.txt   | 12 ++++++++++++
 .../find_package/SearchPaths_prefix_lib_pkg.cmake        |  1 +
 .../SearchPaths_prefix_lib_pkg_cmake-stderr.txt          | 12 ++++++++++++
 .../find_package/SearchPaths_prefix_lib_pkg_cmake.cmake  |  1 +
 .../find_package/SearchPaths_prefix_pkg-stderr.txt       | 12 ++++++++++++
 Tests/RunCMake/find_package/SearchPaths_prefix_pkg.cmake |  1 +
 .../find_package/SearchPaths_prefix_pkg_cmake-stderr.txt | 14 ++++++++++++++
 .../find_package/SearchPaths_prefix_pkg_cmake.cmake      |  1 +
 .../SearchPaths_prefix_pkg_lib_cmake_pkg-stderr.txt      | 14 ++++++++++++++
 .../SearchPaths_prefix_pkg_lib_cmake_pkg.cmake           |  1 +
 .../SearchPaths_prefix_pkg_lib_pkg-stderr.txt            | 14 ++++++++++++++
 .../find_package/SearchPaths_prefix_pkg_lib_pkg.cmake    |  1 +
 .../SearchPaths_prefix_pkg_lib_pkg_cmake-stderr.txt      | 14 ++++++++++++++
 .../SearchPaths_prefix_pkg_lib_pkg_cmake.cmake           |  1 +
 .../SearchPaths_prefix_pkg_share_cmake_pkg-stderr.txt    | 14 ++++++++++++++
 .../SearchPaths_prefix_pkg_share_cmake_pkg.cmake         |  1 +
 .../SearchPaths_prefix_pkg_share_pkg-stderr.txt          | 14 ++++++++++++++
 .../find_package/SearchPaths_prefix_pkg_share_pkg.cmake  |  1 +
 .../SearchPaths_prefix_pkg_share_pkg_cmake-stderr.txt    | 14 ++++++++++++++
 .../SearchPaths_prefix_pkg_share_pkg_cmake.cmake         |  1 +
 .../SearchPaths_prefix_share_cmake_pkg-stderr.txt        | 12 ++++++++++++
 .../SearchPaths_prefix_share_cmake_pkg.cmake             |  1 +
 .../find_package/SearchPaths_prefix_share_pkg-stderr.txt | 12 ++++++++++++
 .../find_package/SearchPaths_prefix_share_pkg.cmake      |  1 +
 .../SearchPaths_prefix_share_pkg_cmake-stderr.txt        | 12 ++++++++++++
 .../SearchPaths_prefix_share_pkg_cmake.cmake             |  1 +
 50 files changed, 238 insertions(+)
 create mode 100644 Tests/RunCMake/find_package/SearchPaths.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_cmake/cmake/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_lib_cmake_pkg/lib/cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_lib_pkg/lib/SearchPaths-1.2.3/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_lib_pkg_cmake/lib/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_pkg/SearchPaths-1.2.3/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_pkg_cmake/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_cmake_pkg/SearchPaths-1.2.3/lib/cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg/SearchPaths-1.2.3/lib/SearchPaths-1.2.3/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg_cmake/SearchPaths-1.2.3/lib/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_cmake_pkg/SearchPaths-1.2.3/share/cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg/SearchPaths-1.2.3/share/SearchPaths-1.2.3/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg_cmake/SearchPaths-1.2.3/share/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_share_cmake_pkg/share/cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_share_pkg/share/SearchPaths-1.2.3/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths/prefix_share_pkg_cmake/share/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_cmake-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_cmake.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_lib_cmake_pkg-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_lib_cmake_pkg.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg_cmake-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg_cmake.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg_cmake-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg_cmake.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_cmake_pkg-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_cmake_pkg.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg_cmake-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg_cmake.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_cmake_pkg-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_cmake_pkg.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg_cmake-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg_cmake.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_share_cmake_pkg-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_share_cmake_pkg.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg.cmake
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg_cmake-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg_cmake.cmake

diff --git a/Tests/RunCMake/find_package/RunCMakeTest.cmake b/Tests/RunCMake/find_package/RunCMakeTest.cmake
index 32e54d5..fa41fc1 100644
--- a/Tests/RunCMake/find_package/RunCMakeTest.cmake
+++ b/Tests/RunCMake/find_package/RunCMakeTest.cmake
@@ -55,6 +55,22 @@ run_cmake(REGISTRY_VIEW-no-view)
 run_cmake(REGISTRY_VIEW-wrong-view)
 run_cmake(REGISTRY_VIEW-propagated)
 
+file(
+    GLOB SearchPaths_TEST_CASE_LIST
+    LIST_DIRECTORIES TRUE
+    "${RunCMake_SOURCE_DIR}/SearchPaths/*"
+  )
+foreach(TestCasePrefix IN LISTS SearchPaths_TEST_CASE_LIST)
+  if(IS_DIRECTORY "${TestCasePrefix}")
+    cmake_path(GET TestCasePrefix FILENAME TestSuffix)
+    run_cmake_with_options(
+      SearchPaths_${TestSuffix}
+        "-DSearchPaths_ROOT=${TestCasePrefix}"
+        "--debug-find-pkg=SearchPaths"
+      )
+  endif()
+endforeach()
+
 if(UNIX
     AND NOT MSYS # FIXME: This works on CYGWIN but not on MSYS
     )
diff --git a/Tests/RunCMake/find_package/SearchPaths.cmake b/Tests/RunCMake/find_package/SearchPaths.cmake
new file mode 100644
index 0000000..a5a10fc
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0074 NEW)
+find_package(SearchPaths REQUIRED CONFIG)
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_cmake/cmake/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_cmake/cmake/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_lib_cmake_pkg/lib/cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_lib_cmake_pkg/lib/cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_lib_pkg/lib/SearchPaths-1.2.3/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_lib_pkg/lib/SearchPaths-1.2.3/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_lib_pkg_cmake/lib/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_lib_pkg_cmake/lib/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_pkg/SearchPaths-1.2.3/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_pkg/SearchPaths-1.2.3/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_cmake/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_cmake/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_cmake_pkg/SearchPaths-1.2.3/lib/cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_cmake_pkg/SearchPaths-1.2.3/lib/cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg/SearchPaths-1.2.3/lib/SearchPaths-1.2.3/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg/SearchPaths-1.2.3/lib/SearchPaths-1.2.3/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg_cmake/SearchPaths-1.2.3/lib/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg_cmake/SearchPaths-1.2.3/lib/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_cmake_pkg/SearchPaths-1.2.3/share/cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_cmake_pkg/SearchPaths-1.2.3/share/cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg/SearchPaths-1.2.3/share/SearchPaths-1.2.3/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg/SearchPaths-1.2.3/share/SearchPaths-1.2.3/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg_cmake/SearchPaths-1.2.3/share/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg_cmake/SearchPaths-1.2.3/share/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_share_cmake_pkg/share/cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_share_cmake_pkg/share/cmake/SearchPaths-1.2.3/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_share_pkg/share/SearchPaths-1.2.3/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_share_pkg/share/SearchPaths-1.2.3/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths/prefix_share_pkg_cmake/share/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake b/Tests/RunCMake/find_package/SearchPaths/prefix_share_pkg_cmake/share/SearchPaths-1.2.3/cmake/SearchPathsConfig.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix-stderr.txt
new file mode 100644
index 0000000..fae13ef
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix-stderr.txt
@@ -0,0 +1,10 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_cmake-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_cmake-stderr.txt
new file mode 100644
index 0000000..eba88c9
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_cmake-stderr.txt
@@ -0,0 +1,12 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_cmake-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_cmake-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_cmake/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_cmake/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_cmake/cmake/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_cmake/cmake/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_cmake.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_cmake.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_cmake.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_lib_cmake_pkg-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_lib_cmake_pkg-stderr.txt
new file mode 100644
index 0000000..cebc169
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_lib_cmake_pkg-stderr.txt
@@ -0,0 +1,12 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_lib_cmake_pkg-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_lib_cmake_pkg-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_lib_cmake_pkg/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_lib_cmake_pkg/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_lib_cmake_pkg/lib/cmake/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_lib_cmake_pkg/lib/cmake/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_lib_cmake_pkg.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_lib_cmake_pkg.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_lib_cmake_pkg.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg-stderr.txt
new file mode 100644
index 0000000..4e5d3f6
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg-stderr.txt
@@ -0,0 +1,12 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_lib_pkg/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_lib_pkg/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_lib_pkg/lib/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_lib_pkg/lib/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg_cmake-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg_cmake-stderr.txt
new file mode 100644
index 0000000..f290545
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg_cmake-stderr.txt
@@ -0,0 +1,12 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg_cmake-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg_cmake-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_lib_pkg_cmake/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_lib_pkg_cmake/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_lib_pkg_cmake/lib/SearchPaths-1\.2\.3/cmake/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_lib_pkg_cmake/lib/SearchPaths-1\.2\.3/cmake/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg_cmake.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg_cmake.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_lib_pkg_cmake.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg-stderr.txt
new file mode 100644
index 0000000..32b9fcb
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg-stderr.txt
@@ -0,0 +1,12 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_cmake-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_cmake-stderr.txt
new file mode 100644
index 0000000..7bf5cf8
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_cmake-stderr.txt
@@ -0,0 +1,14 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_cmake-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_cmake-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_cmake/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_cmake/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_cmake/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_cmake/SearchPaths-1\.2\.3/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_cmake/SearchPaths-1\.2\.3/cmake/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_cmake/SearchPaths-1\.2\.3/cmake/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_cmake.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_cmake.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_cmake.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_cmake_pkg-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_cmake_pkg-stderr.txt
new file mode 100644
index 0000000..3592f72
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_cmake_pkg-stderr.txt
@@ -0,0 +1,14 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_cmake_pkg-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_cmake_pkg-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_cmake_pkg/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_cmake_pkg/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_cmake_pkg/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_cmake_pkg/SearchPaths-1\.2\.3/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_cmake_pkg/SearchPaths-1\.2\.3/lib/cmake/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_cmake_pkg/SearchPaths-1\.2\.3/lib/cmake/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_cmake_pkg.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_cmake_pkg.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_cmake_pkg.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg-stderr.txt
new file mode 100644
index 0000000..b196b7a
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg-stderr.txt
@@ -0,0 +1,14 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg/SearchPaths-1\.2\.3/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg/SearchPaths-1\.2\.3/lib/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg/SearchPaths-1\.2\.3/lib/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg_cmake-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg_cmake-stderr.txt
new file mode 100644
index 0000000..17e0399
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg_cmake-stderr.txt
@@ -0,0 +1,14 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg_cmake-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg_cmake-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg_cmake/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg_cmake/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg_cmake/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg_cmake/SearchPaths-1\.2\.3/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg_cmake/SearchPaths-1\.2\.3/lib/SearchPaths-1\.2\.3/cmake/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_lib_pkg_cmake/SearchPaths-1\.2\.3/lib/SearchPaths-1\.2\.3/cmake/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg_cmake.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg_cmake.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_lib_pkg_cmake.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_cmake_pkg-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_cmake_pkg-stderr.txt
new file mode 100644
index 0000000..ee01a50
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_cmake_pkg-stderr.txt
@@ -0,0 +1,14 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_cmake_pkg-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_cmake_pkg-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_cmake_pkg/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_cmake_pkg/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_cmake_pkg/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_cmake_pkg/SearchPaths-1\.2\.3/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_cmake_pkg/SearchPaths-1\.2\.3/share/cmake/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_cmake_pkg/SearchPaths-1\.2\.3/share/cmake/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_cmake_pkg.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_cmake_pkg.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_cmake_pkg.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg-stderr.txt
new file mode 100644
index 0000000..d6abd2f
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg-stderr.txt
@@ -0,0 +1,14 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg/SearchPaths-1\.2\.3/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg/SearchPaths-1\.2\.3/share/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg/SearchPaths-1\.2\.3/share/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg_cmake-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg_cmake-stderr.txt
new file mode 100644
index 0000000..b578b2b
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg_cmake-stderr.txt
@@ -0,0 +1,14 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg_cmake-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg_cmake-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg_cmake/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg_cmake/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg_cmake/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg_cmake/SearchPaths-1\.2\.3/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg_cmake/SearchPaths-1\.2\.3/share/SearchPaths-1\.2\.3/cmake/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_pkg_share_pkg_cmake/SearchPaths-1\.2\.3/share/SearchPaths-1\.2\.3/cmake/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg_cmake.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg_cmake.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_pkg_share_pkg_cmake.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_share_cmake_pkg-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_share_cmake_pkg-stderr.txt
new file mode 100644
index 0000000..2f3f18a
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_share_cmake_pkg-stderr.txt
@@ -0,0 +1,12 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_share_cmake_pkg-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_share_cmake_pkg-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_share_cmake_pkg/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_share_cmake_pkg/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_share_cmake_pkg/share/cmake/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_share_cmake_pkg/share/cmake/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_share_cmake_pkg.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_share_cmake_pkg.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_share_cmake_pkg.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg-stderr.txt
new file mode 100644
index 0000000..3eef002
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg-stderr.txt
@@ -0,0 +1,12 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_share_pkg/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_share_pkg/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_share_pkg/share/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_share_pkg/share/SearchPaths-1\.2\.3/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg_cmake-stderr.txt b/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg_cmake-stderr.txt
new file mode 100644
index 0000000..c962f8b
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg_cmake-stderr.txt
@@ -0,0 +1,12 @@
+  find_package considered the following locations for SearchPaths's Config
+  module:
+
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg_cmake-build/CMakeFiles/pkgRedirects/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg_cmake-build/CMakeFiles/pkgRedirects/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_share_pkg_cmake/SearchPathsConfig\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_share_pkg_cmake/searchpaths-config\.cmake
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_share_pkg_cmake/share/SearchPaths-1\.2\.3/cmake/SearchPathsConfig\.cmake
+
+  The file was found at
+
+    .*/Tests/RunCMake/find_package/SearchPaths/prefix_share_pkg_cmake/share/SearchPaths-1\.2\.3/cmake/SearchPathsConfig\.cmake
diff --git a/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg_cmake.cmake b/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg_cmake.cmake
new file mode 100644
index 0000000..d831313
--- /dev/null
+++ b/Tests/RunCMake/find_package/SearchPaths_prefix_share_pkg_cmake.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_SOURCE_DIR}/SearchPaths.cmake")
-- 
cgit v0.12


From 1bed0be2cd0913a2d0f21c4ff5ebe058e23fdfb5 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 27 Jun 2022 06:18:54 +0400
Subject: cmFindPackageCommand: Use `std::any_of` instead of "manual" `for`
 loops

---
 Source/cmFindPackageCommand.cxx | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 4ad9124..5dab179 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -2279,12 +2279,10 @@ private:
   std::vector<std::string> const& Vector;
   bool Search(std::string const& parent, cmFileList& lister) override
   {
-    for (std::string const& i : this->Vector) {
-      if (this->Consider(parent + i, lister)) {
-        return true;
-      }
-    }
-    return false;
+    return std::any_of(this->Vector.cbegin(), this->Vector.cend(),
+                       [this, &parent, &lister](std::string const& i) {
+                         return this->Consider(parent + i, lister);
+                       });
   }
   std::unique_ptr<cmFileListGeneratorBase> Clone() const override
   {
@@ -2349,12 +2347,10 @@ private:
                                  this->SortOrder, this->SortDirection);
     }
 
-    for (std::string const& i : matches) {
-      if (this->Consider(parent + i, lister)) {
-        return true;
-      }
-    }
-    return false;
+    return std::any_of(matches.cbegin(), matches.cend(),
+                       [this, &parent, &lister](std::string const& i) {
+                         return this->Consider(parent + i, lister);
+                       });
   }
   std::unique_ptr<cmFileListGeneratorBase> Clone() const override
   {
@@ -2401,12 +2397,10 @@ private:
       }
     }
 
-    for (std::string const& i : matches) {
-      if (this->Consider(parent + i, lister)) {
-        return true;
-      }
-    }
-    return false;
+    return std::any_of(matches.cbegin(), matches.cend(),
+                       [this, &parent, &lister](std::string const& i) {
+                         return this->Consider(parent + i, lister);
+                       });
   }
   std::unique_ptr<cmFileListGeneratorBase> Clone() const override
   {
@@ -2483,12 +2477,10 @@ private:
     std::vector<std::string> const& files = g.GetFiles();
 
     // Look for directories among the matches.
-    for (std::string const& f : files) {
-      if (this->Consider(f, lister)) {
-        return true;
-      }
-    }
-    return false;
+    return std::any_of(files.cbegin(), files.cend(),
+                       [this, &lister](std::string const& f) {
+                         return this->Consider(f, lister);
+                       });
   }
   std::unique_ptr<cmFileListGeneratorBase> Clone() const override
   {
-- 
cgit v0.12


From 045e36fe368df43d555ab0e7261207a79fef9bcc Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 27 Jun 2022 06:21:11 +0400
Subject: cmFindPackageCommand: Replace single-char string literals with char
 literals

---
 Source/cmFindPackageCommand.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 5dab179..18a12c4 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1941,7 +1941,7 @@ bool cmFindPackageCommand::SearchDirectory(std::string const& dir)
     std::string d = dir;
     if (!s.empty()) {
       d += s;
-      d += "/";
+      d += '/';
     }
     if (this->CheckDirectory(d)) {
       return true;
@@ -2231,9 +2231,9 @@ bool cmFileListGeneratorBase::Consider(std::string const& fullPath,
     return false;
   }
   if (this->Next) {
-    return this->Next->Search(fullPath + "/", listing);
+    return this->Next->Search(fullPath + '/', listing);
   }
-  return listing.Visit(fullPath + "/");
+  return listing.Visit(fullPath + '/');
 }
 
 class cmFileListGeneratorFixed : public cmFileListGeneratorBase
-- 
cgit v0.12


From b5f880d5c69b72dcebd41cd0e5de6a82cdd5bbb2 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 27 Jun 2022 06:22:29 +0400
Subject: cmFindPackageCommand: Deduplicate code to exclude `.` and `..` dir
 entries

---
 Source/cmFindPackageCommand.cxx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 18a12c4..8fcfa22 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -2152,6 +2152,7 @@ public:
 
 protected:
   bool Consider(std::string const& fullPath, cmFileList& listing);
+  static bool IsIgnoredEntry(const char* fname);
 
 private:
   bool Search(cmFileList&);
@@ -2236,6 +2237,12 @@ bool cmFileListGeneratorBase::Consider(std::string const& fullPath,
   return listing.Visit(fullPath + '/');
 }
 
+bool cmFileListGeneratorBase::IsIgnoredEntry(const char* const fname)
+{
+  assert(fname != nullptr);
+  return strcmp(fname, ".") == 0 || strcmp(fname, "..") == 0;
+}
+
 class cmFileListGeneratorFixed : public cmFileListGeneratorBase
 {
 public:
@@ -2330,7 +2337,7 @@ private:
     d.Load(parent);
     for (unsigned long i = 0; i < d.GetNumberOfFiles(); ++i) {
       const char* fname = d.GetFile(i);
-      if (strcmp(fname, ".") == 0 || strcmp(fname, "..") == 0) {
+      if (this->IsIgnoredEntry(fname)) {
         continue;
       }
       for (std::string const& n : this->Names) {
@@ -2386,7 +2393,7 @@ private:
     d.Load(parent);
     for (unsigned long i = 0; i < d.GetNumberOfFiles(); ++i) {
       const char* fname = d.GetFile(i);
-      if (strcmp(fname, ".") == 0 || strcmp(fname, "..") == 0) {
+      if (this->IsIgnoredEntry(fname)) {
         continue;
       }
       for (std::string name : this->Names) {
@@ -2433,7 +2440,7 @@ private:
     d.Load(parent);
     for (unsigned long i = 0; i < d.GetNumberOfFiles(); ++i) {
       const char* fname = d.GetFile(i);
-      if (strcmp(fname, ".") == 0 || strcmp(fname, "..") == 0) {
+      if (this->IsIgnoredEntry(fname)) {
         continue;
       }
       if (cmsysString_strcasecmp(fname, this->String.c_str()) == 0) {
-- 
cgit v0.12


From a3fe1aca0c9720e9725cec5c934c616ceeb592b1 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 27 Jun 2022 06:38:43 +0400
Subject: cmFindPackageCommand: Replace `strcmp` with array subscription

---
 Source/cmFindPackageCommand.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 8fcfa22..cefd380 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -5,7 +5,6 @@
 #include <algorithm>
 #include <cassert>
 #include <cstdio>
-#include <cstring>
 #include <deque>
 #include <functional>
 #include <iterator>
@@ -2240,7 +2239,9 @@ bool cmFileListGeneratorBase::Consider(std::string const& fullPath,
 bool cmFileListGeneratorBase::IsIgnoredEntry(const char* const fname)
 {
   assert(fname != nullptr);
-  return strcmp(fname, ".") == 0 || strcmp(fname, "..") == 0;
+  assert(fname[0] != 0);
+  return fname[0] == '.' &&
+    (fname[1] == 0 || (fname[1] == '.' && fname[2] == 0));
 }
 
 class cmFileListGeneratorFixed : public cmFileListGeneratorBase
-- 
cgit v0.12


From f2a4e4f6fa46d04f117b1b3ed498534aa30fde84 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 27 Jun 2022 06:39:43 +0400
Subject: cmFindPackageCommand: Simplify if-return-else-return into single
 return stmt

---
 Source/cmFindPackageCommand.cxx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index cefd380..a763f18 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -2176,13 +2176,7 @@ public:
     }
     return *this;
   }
-  bool Search()
-  {
-    if (this->First) {
-      return this->First->Search(*this);
-    }
-    return false;
-  }
+  bool Search() { return this->First && this->First->Search(*this); }
 
 private:
   virtual bool Visit(std::string const& fullPath) = 0;
-- 
cgit v0.12


From c6d3ef1c95ed3b3a13ee3a3b2cb00112f1a2bda8 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 27 Jun 2022 07:09:37 +0400
Subject: cmFindPackageCommand: Replace empty string literal w/ default
 `std::string{}`

---
 Source/cmFindPackageCommand.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index a763f18..0347d58 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -2208,7 +2208,7 @@ private:
 
 bool cmFileListGeneratorBase::Search(cmFileList& listing)
 {
-  return this->Search("", listing);
+  return this->Search(std::string{}, listing);
 }
 
 cmFileListGeneratorBase* cmFileListGeneratorBase::SetNext(
-- 
cgit v0.12


From 6a95ab97e77faca8ba7775683f307cd32c82f47f Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 27 Jun 2022 08:17:46 +0400
Subject: cmFindPackageCommand: Deduplicate version string comparator code

---
 Source/cmFindPackageCommand.cxx | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 0347d58..75aaba1 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -45,6 +45,19 @@
 class cmExecutionStatus;
 class cmFileList;
 
+namespace {
+
+template <template <typename> class Op>
+struct StrverscmpOp
+{
+  bool operator()(const std::string& lhs, const std::string& rhs) const
+  {
+    return Op<int>()(cmSystemTools::strverscmp(lhs, rhs), 0);
+  }
+};
+
+} // anonymous namespace
+
 cmFindPackageCommand::PathLabel
   cmFindPackageCommand::PathLabel::PackageRedirect("PACKAGE_REDIRECT");
 cmFindPackageCommand::PathLabel cmFindPackageCommand::PathLabel::UserRegistry(
@@ -59,22 +72,6 @@ const cm::string_view cmFindPackageCommand::VERSION_ENDPOINT_INCLUDED(
 const cm::string_view cmFindPackageCommand::VERSION_ENDPOINT_EXCLUDED(
   "EXCLUDE");
 
-struct StrverscmpGreater
-{
-  bool operator()(const std::string& lhs, const std::string& rhs) const
-  {
-    return cmSystemTools::strverscmp(lhs, rhs) > 0;
-  }
-};
-
-struct StrverscmpLesser
-{
-  bool operator()(const std::string& lhs, const std::string& rhs) const
-  {
-    return cmSystemTools::strverscmp(lhs, rhs) < 0;
-  }
-};
-
 void cmFindPackageCommand::Sort(std::vector<std::string>::iterator begin,
                                 std::vector<std::string>::iterator end,
                                 SortOrderType order, SortDirectionType dir)
@@ -90,9 +87,9 @@ void cmFindPackageCommand::Sort(std::vector<std::string>::iterator begin,
   // compared such that e.g. 000  00 < 01 < 010 < 09 < 0 < 1 < 9 < 10
   {
     if (dir == Dec) {
-      std::sort(begin, end, StrverscmpGreater());
+      std::sort(begin, end, StrverscmpOp<std::greater>());
     } else {
-      std::sort(begin, end, StrverscmpLesser());
+      std::sort(begin, end, StrverscmpOp<std::less>());
     }
   }
   // else do not sort
-- 
cgit v0.12


From 865cfaa492e31609152b1631e94d2bfa41a9e314 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 27 Jun 2022 08:21:49 +0400
Subject: cmFindPackageCommand: Move `collectPathsForDebug()` to anonymous
 namespace

---
 Source/cmFindPackageCommand.cxx | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 75aaba1..f3924c4 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -56,6 +56,21 @@ struct StrverscmpOp
   }
 };
 
+std::size_t collectPathsForDebug(std::string& buffer,
+                                 cmSearchPath const& searchPath,
+                                 std::size_t startIndex = 0)
+{
+  const auto& paths = searchPath.GetPaths();
+  if (paths.empty()) {
+    buffer += "  none\n";
+    return 0;
+  }
+  for (std::size_t i = startIndex; i < paths.size(); i++) {
+    buffer += "  " + paths[i].Path + "\n";
+  }
+  return paths.size();
+}
+
 } // anonymous namespace
 
 cmFindPackageCommand::PathLabel
@@ -1445,21 +1460,6 @@ void cmFindPackageCommand::AppendSuccessInformation()
   }
 }
 
-inline std::size_t collectPathsForDebug(std::string& buffer,
-                                        cmSearchPath const& searchPath,
-                                        std::size_t startIndex = 0)
-{
-  const auto& paths = searchPath.GetPaths();
-  if (paths.empty()) {
-    buffer += "  none\n";
-    return 0;
-  }
-  for (std::size_t i = startIndex; i < paths.size(); i++) {
-    buffer += "  " + paths[i].Path + "\n";
-  }
-  return paths.size();
-}
-
 void cmFindPackageCommand::ComputePrefixes()
 {
   this->FillPrefixesPackageRedirect();
-- 
cgit v0.12


From f71b88c4c16b5379bf45cc11a2cd0eb04ad7f080 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 27 Jun 2022 08:31:28 +0400
Subject: cmFindPackageCommand: Move `cmFindPackageCommandHoldFile` to
 anonymous ns

Also, avoid `#include` in the middle of the module.
---
 Source/cmFindPackageCommand.cxx | 64 ++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index f3924c4..99c4b4e 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -42,6 +42,17 @@
 #  include <StorageDefs.h>
 #endif
 
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#  include <windows.h>
+// http://msdn.microsoft.com/en-us/library/aa384253%28v=vs.85%29.aspx
+#  if !defined(KEY_WOW64_32KEY)
+#    define KEY_WOW64_32KEY 0x0200
+#  endif
+#  if !defined(KEY_WOW64_64KEY)
+#    define KEY_WOW64_64KEY 0x0100
+#  endif
+#endif
+
 class cmExecutionStatus;
 class cmFileList;
 
@@ -71,6 +82,29 @@ std::size_t collectPathsForDebug(std::string& buffer,
   return paths.size();
 }
 
+#if !(defined(_WIN32) && !defined(__CYGWIN__))
+class cmFindPackageCommandHoldFile
+{
+  const char* File;
+
+public:
+  cmFindPackageCommandHoldFile(const char* f)
+    : File(f)
+  {
+  }
+  ~cmFindPackageCommandHoldFile()
+  {
+    if (this->File) {
+      cmSystemTools::RemoveFile(this->File);
+    }
+  }
+  cmFindPackageCommandHoldFile(const cmFindPackageCommandHoldFile&) = delete;
+  cmFindPackageCommandHoldFile& operator=(
+    const cmFindPackageCommandHoldFile&) = delete;
+  void Release() { this->File = nullptr; }
+};
+#endif
+
 } // anonymous namespace
 
 cmFindPackageCommand::PathLabel
@@ -1670,14 +1704,6 @@ void cmFindPackageCommand::FillPrefixesSystemRegistry()
 }
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
-#  include <windows.h>
-// http://msdn.microsoft.com/en-us/library/aa384253%28v=vs.85%29.aspx
-#  if !defined(KEY_WOW64_32KEY)
-#    define KEY_WOW64_32KEY 0x0200
-#  endif
-#  if !defined(KEY_WOW64_64KEY)
-#    define KEY_WOW64_64KEY 0x0100
-#  endif
 void cmFindPackageCommand::LoadPackageRegistryWinUser()
 {
   // HKEY_CURRENT_USER\\Software shares 32-bit and 64-bit views.
@@ -1752,28 +1778,8 @@ void cmFindPackageCommand::LoadPackageRegistryWin(bool user, unsigned int view,
     RegCloseKey(hKey);
   }
 }
-#else
-class cmFindPackageCommandHoldFile
-{
-  const char* File;
-
-public:
-  cmFindPackageCommandHoldFile(const char* f)
-    : File(f)
-  {
-  }
-  ~cmFindPackageCommandHoldFile()
-  {
-    if (this->File) {
-      cmSystemTools::RemoveFile(this->File);
-    }
-  }
-  cmFindPackageCommandHoldFile(const cmFindPackageCommandHoldFile&) = delete;
-  cmFindPackageCommandHoldFile& operator=(
-    const cmFindPackageCommandHoldFile&) = delete;
-  void Release() { this->File = nullptr; }
-};
 
+#else
 void cmFindPackageCommand::LoadPackageRegistryDir(std::string const& dir,
                                                   cmSearchPath& outPaths)
 {
-- 
cgit v0.12


From c67b82c998d92db285ebfe5870435a0d231cb149 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 27 Jun 2022 08:49:25 +0400
Subject: cmFindPackageCommand: Enclose file list generators into anonymous ns

---
 Source/cmFindPackageCommand.cxx | 49 +++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 99c4b4e..55f699b 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -54,7 +54,6 @@
 #endif
 
 class cmExecutionStatus;
-class cmFileList;
 
 namespace {
 
@@ -2147,6 +2146,9 @@ void cmFindPackageCommand::StoreVersionFound()
   }
 }
 
+namespace {
+class cmFileList;
+
 class cmFileListGeneratorBase
 {
 public:
@@ -2188,27 +2190,6 @@ private:
   cmFileListGeneratorBase* Last = nullptr;
 };
 
-class cmFindPackageFileList : public cmFileList
-{
-public:
-  cmFindPackageFileList(cmFindPackageCommand* fpc, bool use_suffixes = true)
-    : FPC(fpc)
-    , UseSuffixes(use_suffixes)
-  {
-  }
-
-private:
-  bool Visit(std::string const& fullPath) override
-  {
-    if (this->UseSuffixes) {
-      return this->FPC->SearchDirectory(fullPath);
-    }
-    return this->FPC->CheckDirectory(fullPath);
-  }
-  cmFindPackageCommand* FPC;
-  bool UseSuffixes;
-};
-
 bool cmFileListGeneratorBase::Search(cmFileList& listing)
 {
   return this->Search(std::string{}, listing);
@@ -2240,7 +2221,30 @@ bool cmFileListGeneratorBase::IsIgnoredEntry(const char* const fname)
   return fname[0] == '.' &&
     (fname[1] == 0 || (fname[1] == '.' && fname[2] == 0));
 }
+} // anonymous namespace
+
+class cmFindPackageFileList : public cmFileList
+{
+public:
+  cmFindPackageFileList(cmFindPackageCommand* fpc, bool use_suffixes = true)
+    : FPC(fpc)
+    , UseSuffixes(use_suffixes)
+  {
+  }
+
+private:
+  bool Visit(std::string const& fullPath) override
+  {
+    if (this->UseSuffixes) {
+      return this->FPC->SearchDirectory(fullPath);
+    }
+    return this->FPC->CheckDirectory(fullPath);
+  }
+  cmFindPackageCommand* FPC;
+  bool UseSuffixes;
+};
 
+namespace {
 class cmFileListGeneratorFixed : public cmFileListGeneratorBase
 {
 public:
@@ -2492,6 +2496,7 @@ private:
     return cm::make_unique<cmFileListGeneratorGlob>(*this);
   }
 };
+} // anonymous namespace
 
 bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
 {
-- 
cgit v0.12


From f9f4e104b0d7ccfaf6a57f0c61b78869431f6567 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 27 Jun 2022 09:58:43 +0400
Subject: cmFindPackageCommand: Constness

---
 Source/cmFindPackageCommand.cxx | 128 +++++++++++++++++++++-------------------
 1 file changed, 66 insertions(+), 62 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 55f699b..f6312e5 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -68,7 +68,7 @@ struct StrverscmpOp
 
 std::size_t collectPathsForDebug(std::string& buffer,
                                  cmSearchPath const& searchPath,
-                                 std::size_t startIndex = 0)
+                                 std::size_t const startIndex = 0)
 {
   const auto& paths = searchPath.GetPaths();
   if (paths.empty()) {
@@ -87,7 +87,7 @@ class cmFindPackageCommandHoldFile
   const char* File;
 
 public:
-  cmFindPackageCommandHoldFile(const char* f)
+  cmFindPackageCommandHoldFile(const char* const f)
     : File(f)
   {
   }
@@ -122,7 +122,8 @@ const cm::string_view cmFindPackageCommand::VERSION_ENDPOINT_EXCLUDED(
 
 void cmFindPackageCommand::Sort(std::vector<std::string>::iterator begin,
                                 std::vector<std::string>::iterator end,
-                                SortOrderType order, SortDirectionType dir)
+                                SortOrderType const order,
+                                SortDirectionType const dir)
 {
   if (order == Name_order) {
     if (dir == Dec) {
@@ -157,11 +158,10 @@ cmFindPackageCommand::cmFindPackageCommand(cmExecutionStatus& status)
 
 void cmFindPackageCommand::AppendSearchPathGroups()
 {
-  std::vector<cmFindCommon::PathLabel>* labels;
-
   // Update the All group with new paths. Note that package redirection must
   // take precedence over everything else, so it has to be first in the array.
-  labels = &this->PathGroupLabelMap[PathGroup::All];
+  std::vector<cmFindCommon::PathLabel>* const labels =
+    &this->PathGroupLabelMap[PathGroup::All];
   labels->insert(labels->begin(), PathLabel::PackageRedirect);
   labels->insert(
     std::find(labels->begin(), labels->end(), PathLabel::CMakeSystem),
@@ -191,7 +191,7 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
   }
 
   // Lookup required version of CMake.
-  if (cmValue rv =
+  if (cmValue const rv =
         this->Makefile->GetDefinition("CMAKE_MINIMUM_REQUIRED_VERSION")) {
     unsigned int v[3] = { 0, 0, 0 };
     sscanf(rv->c_str(), "%u.%u.%u", &v[0], &v[1], &v[2]);
@@ -199,7 +199,7 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
   }
 
   // Lookup target architecture, if any.
-  if (cmValue arch =
+  if (cmValue const arch =
         this->Makefile->GetDefinition("CMAKE_LIBRARY_ARCHITECTURE")) {
     this->LibraryArchitecture = *arch;
   }
@@ -228,7 +228,7 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
   // Check if User Package Registry should be disabled
   // The `CMAKE_FIND_USE_PACKAGE_REGISTRY` has
   // priority over the deprecated CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY
-  if (cmValue def =
+  if (cmValue const def =
         this->Makefile->GetDefinition("CMAKE_FIND_USE_PACKAGE_REGISTRY")) {
     this->NoUserRegistry = !cmIsOn(*def);
   } else if (this->Makefile->IsOn("CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY")) {
@@ -238,7 +238,7 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
   // Check if System Package Registry should be disabled
   // The `CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY` has
   // priority over the deprecated CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY
-  if (cmValue def = this->Makefile->GetDefinition(
+  if (cmValue const def = this->Makefile->GetDefinition(
         "CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY")) {
     this->NoSystemRegistry = !cmIsOn(*def);
   } else if (this->Makefile->IsOn(
@@ -252,7 +252,7 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
   }
 
   // Check if Sorting should be enabled
-  if (cmValue so =
+  if (cmValue const so =
         this->Makefile->GetDefinition("CMAKE_FIND_PACKAGE_SORT_ORDER")) {
 
     if (*so == "NAME") {
@@ -263,7 +263,7 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
       this->SortOrder = None;
     }
   }
-  if (cmValue sd =
+  if (cmValue const sd =
         this->Makefile->GetDefinition("CMAKE_FIND_PACKAGE_SORT_DIRECTION")) {
     this->SortDirection = (*sd == "ASC") ? Asc : Dec;
   }
@@ -405,8 +405,8 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
         requiredComponents.insert(args[i]);
       }
 
-      std::string req_var = this->Name + "_FIND_REQUIRED_" + args[i];
-      componentVarDefs.emplace_back(req_var, isRequired);
+      componentVarDefs.emplace_back(this->Name + "_FIND_REQUIRED_" + args[i],
+                                    isRequired);
 
       // Append to the list of required components.
       components += components_sep;
@@ -487,20 +487,20 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
   if (this->VersionComplete.empty() || components.empty()) {
     // Check whether we are recursing inside "Find<name>.cmake" within
     // another find_package(<name>) call.
-    std::string mod = cmStrCat(this->Name, "_FIND_MODULE");
+    std::string const mod = cmStrCat(this->Name, "_FIND_MODULE");
     if (this->Makefile->IsOn(mod)) {
       if (this->VersionComplete.empty()) {
         // Get version information from the outer call if necessary.
         // Requested version string.
-        std::string ver = cmStrCat(this->Name, "_FIND_VERSION_COMPLETE");
+        std::string const ver = cmStrCat(this->Name, "_FIND_VERSION_COMPLETE");
         this->VersionComplete = this->Makefile->GetSafeDefinition(ver);
 
         // Whether an exact version is required.
-        std::string exact = cmStrCat(this->Name, "_FIND_VERSION_EXACT");
+        std::string const exact = cmStrCat(this->Name, "_FIND_VERSION_EXACT");
         this->VersionExact = this->Makefile->IsOn(exact);
       }
       if (components.empty()) {
-        std::string components_var = this->Name + "_FIND_COMPONENTS";
+        std::string const components_var = this->Name + "_FIND_COMPONENTS";
         components = this->Makefile->GetSafeDefinition(components_var);
       }
     }
@@ -577,7 +577,7 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
     }
   }
 
-  std::string disableFindPackageVar =
+  std::string const disableFindPackageVar =
     cmStrCat("CMAKE_DISABLE_FIND_PACKAGE_", this->Name);
   if (this->Makefile->IsOn(disableFindPackageVar)) {
     if (this->Required) {
@@ -601,8 +601,8 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
   // A dependency provider (if set) gets first look before other methods.
   // We do this before modifying the package root path stack because a
   // provider might use methods that ignore that.
-  cmState* state = this->Makefile->GetState();
-  cmState::Command providerCommand = state->GetDependencyProviderCommand(
+  cmState* const state = this->Makefile->GetState();
+  cmState::Command const providerCommand = state->GetDependencyProviderCommand(
     cmDependencyProvider::Method::FindPackage);
   if (bypassProvider) {
     if (this->DebugMode && providerCommand) {
@@ -857,9 +857,9 @@ bool cmFindPackageCommand::FindPackageUsingConfigMode()
 void cmFindPackageCommand::SetVersionVariables(
   const std::function<void(const std::string&, cm::string_view)>&
     addDefinition,
-  const std::string& prefix, const std::string& version, unsigned int count,
-  unsigned int major, unsigned int minor, unsigned int patch,
-  unsigned int tweak)
+  const std::string& prefix, const std::string& version,
+  const unsigned int count, const unsigned int major, const unsigned int minor,
+  const unsigned int patch, const unsigned int tweak)
 {
   addDefinition(prefix, version);
 
@@ -954,7 +954,7 @@ void cmFindPackageCommand::SetModuleVariables(
 }
 
 void cmFindPackageCommand::AddFindDefinition(const std::string& var,
-                                             cm::string_view value)
+                                             const cm::string_view value)
 {
   if (cmValue old = this->Makefile->GetDefinition(var)) {
     this->OriginalDefs[var].exists = true;
@@ -998,7 +998,7 @@ bool cmFindPackageCommand::FindModule(bool& found)
 
   if (!mfile.empty()) {
     if (system) {
-      auto it = this->DeprecatedFindModules.find(this->Name);
+      auto const it = this->DeprecatedFindModules.find(this->Name);
       if (it != this->DeprecatedFindModules.end()) {
         cmPolicies::PolicyStatus status =
           this->Makefile->GetPolicyStatus(it->second);
@@ -1022,13 +1022,13 @@ bool cmFindPackageCommand::FindModule(bool& found)
     // Load the module we found, and set "<name>_FIND_MODULE" to true
     // while inside it.
     found = true;
-    std::string var = cmStrCat(this->Name, "_FIND_MODULE");
+    std::string const var = cmStrCat(this->Name, "_FIND_MODULE");
     this->Makefile->AddDefinition(var, "1");
     bool result = this->ReadListFile(mfile, DoPolicyScope);
     this->Makefile->RemoveDefinition(var);
 
     if (this->DebugMode) {
-      std::string foundVar = cmStrCat(this->Name, "_FOUND");
+      std::string const foundVar = cmStrCat(this->Name, "_FOUND");
       if (this->Makefile->IsDefinitionSet(foundVar) &&
           !this->Makefile->IsOn(foundVar)) {
 
@@ -1043,7 +1043,7 @@ bool cmFindPackageCommand::FindModule(bool& found)
 }
 
 bool cmFindPackageCommand::HandlePackageMode(
-  HandlePackageModeType handlePackageModeType)
+  const HandlePackageModeType handlePackageModeType)
 {
   this->ConsideredConfigs.clear();
 
@@ -1086,8 +1086,9 @@ bool cmFindPackageCommand::HandlePackageMode(
     }
   }
 
-  std::string foundVar = cmStrCat(this->Name, "_FOUND");
-  std::string notFoundMessageVar = cmStrCat(this->Name, "_NOT_FOUND_MESSAGE");
+  std::string const foundVar = cmStrCat(this->Name, "_FOUND");
+  std::string const notFoundMessageVar =
+    cmStrCat(this->Name, "_NOT_FOUND_MESSAGE");
   std::string notFoundMessage;
 
   // If the directory for the config file was found, try to read the file.
@@ -1261,16 +1262,16 @@ bool cmFindPackageCommand::HandlePackageMode(
   this->Makefile->AddDefinition(foundVar, found ? "1" : "0");
 
   // Set a variable naming the configuration file that was found.
-  std::string fileVar = cmStrCat(this->Name, "_CONFIG");
+  std::string const fileVar = cmStrCat(this->Name, "_CONFIG");
   if (found) {
     this->Makefile->AddDefinition(fileVar, this->FileFound);
   } else {
     this->Makefile->RemoveDefinition(fileVar);
   }
 
-  std::string consideredConfigsVar =
+  std::string const consideredConfigsVar =
     cmStrCat(this->Name, "_CONSIDERED_CONFIGS");
-  std::string consideredVersionsVar =
+  std::string const consideredVersionsVar =
     cmStrCat(this->Name, "_CONSIDERED_VERSIONS");
 
   std::string consideredConfigFiles;
@@ -1356,7 +1357,7 @@ bool cmFindPackageCommand::FindConfig()
 
 void cmFindPackageCommand::SetConfigDirCacheVariable(const std::string& value)
 {
-  std::string help =
+  std::string const help =
     cmStrCat("The directory containing a CMake configuration file for ",
              this->Name, '.');
   this->Makefile->AddCacheDefinition(this->Variable, value, help.c_str(),
@@ -1395,7 +1396,7 @@ bool cmFindPackageCommand::FindAppBundleConfig()
 }
 
 bool cmFindPackageCommand::ReadListFile(const std::string& f,
-                                        PolicyScopeRule psr)
+                                        const PolicyScopeRule psr)
 {
   const bool noPolicyScope = !this->PolicyScope || psr == NoPolicyScope;
 
@@ -1406,12 +1407,12 @@ bool cmFindPackageCommand::ReadListFile(const std::string& f,
   if (this->Makefile->ReadDependentFile(f, noPolicyScope)) {
     return true;
   }
-  std::string e = cmStrCat("Error reading CMake code from \"", f, "\".");
+  std::string const e = cmStrCat("Error reading CMake code from \"", f, "\".");
   this->SetError(e);
   return false;
 }
 
-void cmFindPackageCommand::AppendToFoundProperty(bool found)
+void cmFindPackageCommand::AppendToFoundProperty(const bool found)
 {
   std::vector<std::string> foundContents;
   cmValue foundProp =
@@ -1454,27 +1455,28 @@ void cmFindPackageCommand::AppendToFoundProperty(bool found)
 void cmFindPackageCommand::AppendSuccessInformation()
 {
   {
-    std::string transitivePropName =
+    std::string const transitivePropName =
       cmStrCat("_CMAKE_", this->Name, "_TRANSITIVE_DEPENDENCY");
     this->Makefile->GetState()->SetGlobalProperty(transitivePropName, "False");
   }
-  std::string found = cmStrCat(this->Name, "_FOUND");
-  std::string upperFound = cmSystemTools::UpperCase(found);
+  std::string const found = cmStrCat(this->Name, "_FOUND");
+  std::string const upperFound = cmSystemTools::UpperCase(found);
 
-  bool upperResult = this->Makefile->IsOn(upperFound);
-  bool result = this->Makefile->IsOn(found);
-  bool packageFound = (result || upperResult);
+  bool const upperResult = this->Makefile->IsOn(upperFound);
+  bool const result = this->Makefile->IsOn(found);
+  bool const packageFound = (result || upperResult);
 
   this->AppendToFoundProperty(packageFound);
 
   // Record whether the find was quiet or not, so this can be used
   // e.g. in FeatureSummary.cmake
-  std::string quietInfoPropName = cmStrCat("_CMAKE_", this->Name, "_QUIET");
+  std::string const quietInfoPropName =
+    cmStrCat("_CMAKE_", this->Name, "_QUIET");
   this->Makefile->GetState()->SetGlobalProperty(
     quietInfoPropName, this->Quiet ? "TRUE" : "FALSE");
 
   // set a global property to record the required version of this package
-  std::string versionInfoPropName =
+  std::string const versionInfoPropName =
     cmStrCat("_CMAKE_", this->Name, "_REQUIRED_VERSION");
   std::string versionInfo;
   if (!this->VersionRange.empty()) {
@@ -1486,7 +1488,7 @@ void cmFindPackageCommand::AppendSuccessInformation()
   this->Makefile->GetState()->SetGlobalProperty(versionInfoPropName,
                                                 versionInfo.c_str());
   if (this->Required) {
-    std::string requiredInfoPropName =
+    std::string const requiredInfoPropName =
       cmStrCat("_CMAKE_", this->Name, "_TYPE");
     this->Makefile->GetState()->SetGlobalProperty(requiredInfoPropName,
                                                   "REQUIRED");
@@ -1725,7 +1727,8 @@ void cmFindPackageCommand::LoadPackageRegistryWinSystem()
   }
 }
 
-void cmFindPackageCommand::LoadPackageRegistryWin(bool user, unsigned int view,
+void cmFindPackageCommand::LoadPackageRegistryWin(const bool user,
+                                                  const unsigned int view,
                                                   cmSearchPath& outPaths)
 {
   std::wstring key = L"Software\\Kitware\\CMake\\Packages\\";
@@ -1878,7 +1881,7 @@ void cmFindPackageCommand::FillPrefixesCMakeSystemVariable()
     std::vector<std::string> expanded = cmExpandedList(*prefix_paths);
     long count = 0;
     for (const auto& path : expanded) {
-      bool to_add =
+      bool const to_add =
         !(path == install_path_to_remove && ++count == install_prefix_count);
       if (to_add) {
         paths.AddPath(path);
@@ -1956,7 +1959,7 @@ bool cmFindPackageCommand::CheckDirectory(std::string const& dir)
   assert(!dir.empty() && dir.back() == '/');
 
   // Look for the file in this directory.
-  std::string d = dir.substr(0, dir.size() - 1);
+  std::string const d = dir.substr(0, dir.size() - 1);
   if (this->FindConfigFile(d, this->FileFound)) {
     // Remove duplicate slashes.
     cmSystemTools::ConvertToUnixSlashes(this->FileFound);
@@ -2029,8 +2032,8 @@ bool cmFindPackageCommand::CheckVersionFile(std::string const& version_file,
                                             std::string& result_version)
 {
   // The version file will be loaded in an isolated scope.
-  cmMakefile::ScopePushPop varScope(this->Makefile);
-  cmMakefile::PolicyPushPop polScope(this->Makefile);
+  cmMakefile::ScopePushPop const varScope(this->Makefile);
+  cmMakefile::PolicyPushPop const polScope(this->Makefile);
   static_cast<void>(varScope);
   static_cast<void>(polScope);
 
@@ -2077,7 +2080,7 @@ bool cmFindPackageCommand::CheckVersionFile(std::string const& version_file,
   if (this->ReadListFile(version_file, NoPolicyScope)) {
     // Check the output variables.
     bool okay = this->Makefile->IsOn("PACKAGE_VERSION_EXACT");
-    bool unsuitable = this->Makefile->IsOn("PACKAGE_VERSION_UNSUITABLE");
+    bool const unsuitable = this->Makefile->IsOn("PACKAGE_VERSION_UNSUITABLE");
     if (!okay && !this->VersionExact) {
       okay = this->Makefile->IsOn("PACKAGE_VERSION_COMPATIBLE");
     }
@@ -2130,7 +2133,7 @@ bool cmFindPackageCommand::CheckVersionFile(std::string const& version_file,
 void cmFindPackageCommand::StoreVersionFound()
 {
   // Store the whole version string.
-  std::string ver = cmStrCat(this->Name, "_VERSION");
+  std::string const ver = cmStrCat(this->Name, "_VERSION");
   auto addDefinition = [this](const std::string& variable,
                               cm::string_view value) {
     this->Makefile->AddDefinition(variable, value);
@@ -2226,7 +2229,8 @@ bool cmFileListGeneratorBase::IsIgnoredEntry(const char* const fname)
 class cmFindPackageFileList : public cmFileList
 {
 public:
-  cmFindPackageFileList(cmFindPackageCommand* fpc, bool use_suffixes = true)
+  cmFindPackageFileList(cmFindPackageCommand* const fpc,
+                        bool const use_suffixes = true)
     : FPC(fpc)
     , UseSuffixes(use_suffixes)
   {
@@ -2240,8 +2244,8 @@ private:
     }
     return this->FPC->CheckDirectory(fullPath);
   }
-  cmFindPackageCommand* FPC;
-  bool UseSuffixes;
+  cmFindPackageCommand* const FPC;
+  bool const UseSuffixes;
 };
 
 namespace {
@@ -2338,7 +2342,7 @@ private:
     cmsys::Directory d;
     d.Load(parent);
     for (unsigned long i = 0; i < d.GetNumberOfFiles(); ++i) {
-      const char* fname = d.GetFile(i);
+      const char* const fname = d.GetFile(i);
       if (this->IsIgnoredEntry(fname)) {
         continue;
       }
@@ -2394,7 +2398,7 @@ private:
     cmsys::Directory d;
     d.Load(parent);
     for (unsigned long i = 0; i < d.GetNumberOfFiles(); ++i) {
-      const char* fname = d.GetFile(i);
+      const char* const fname = d.GetFile(i);
       if (this->IsIgnoredEntry(fname)) {
         continue;
       }
@@ -2524,7 +2528,7 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
 
   // Strip the trailing slash because the path generator is about to
   // add one.
-  std::string prefix = prefix_in.substr(0, prefix_in.size() - 1);
+  std::string const prefix = prefix_in.substr(0, prefix_in.size() - 1);
 
   //  PREFIX/(cmake|CMake)/ (useful on windows or in build trees)
   {
@@ -2667,7 +2671,7 @@ bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in)
 
   // Strip the trailing slash because the path generator is about to
   // add one.
-  std::string prefix = prefix_in.substr(0, prefix_in.size() - 1);
+  std::string const prefix = prefix_in.substr(0, prefix_in.size() - 1);
 
   // <prefix>/Foo.framework/Resources/
   {
@@ -2725,7 +2729,7 @@ bool cmFindPackageCommand::SearchAppBundlePrefix(std::string const& prefix_in)
 
   // Strip the trailing slash because the path generator is about to
   // add one.
-  std::string prefix = prefix_in.substr(0, prefix_in.size() - 1);
+  std::string const prefix = prefix_in.substr(0, prefix_in.size() - 1);
 
   // <prefix>/Foo.app/Contents/Resources
   {
-- 
cgit v0.12


From 285c994905781086c0f93551ad0e2a553c845be6 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 27 Jun 2022 09:59:14 +0400
Subject: cmFindPackageCommand: Named lambda w/o capture to normal function

---
 Source/cmFindPackageCommand.cxx | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index f6312e5..70c73ad 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -104,6 +104,15 @@ public:
 };
 #endif
 
+// Parse the version number and store the results that were
+// successfully parsed.
+int parseVersion(const std::string& version, unsigned int& major,
+                 unsigned int& minor, unsigned int& patch, unsigned int& tweak)
+{
+  return std::sscanf(version.c_str(), "%u.%u.%u.%u", &major, &minor, &patch,
+                     &tweak);
+}
+
 } // anonymous namespace
 
 cmFindPackageCommand::PathLabel
@@ -194,7 +203,7 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
   if (cmValue const rv =
         this->Makefile->GetDefinition("CMAKE_MINIMUM_REQUIRED_VERSION")) {
     unsigned int v[3] = { 0, 0, 0 };
-    sscanf(rv->c_str(), "%u.%u.%u", &v[0], &v[1], &v[2]);
+    std::sscanf(rv->c_str(), "%u.%u.%u", &v[0], &v[1], &v[2]);
     this->RequiredCMakeVersion = CMake_VERSION_ENCODE(v[0], v[1], v[2]);
   }
 
@@ -541,15 +550,6 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
     return false;
   }
 
-  // Parse the version number and store the results that were
-  // successfully parsed.
-  auto parseVersion = [](const std::string& version, unsigned int& major,
-                         unsigned int& minor, unsigned int& patch,
-                         unsigned int& tweak) -> unsigned int {
-    return sscanf(version.c_str(), "%u.%u.%u.%u", &major, &minor, &patch,
-                  &tweak);
-  };
-
   if (!this->Version.empty()) {
     this->VersionCount =
       parseVersion(this->Version, this->VersionMajor, this->VersionMinor,
@@ -2100,8 +2100,8 @@ bool cmFindPackageCommand::CheckVersionFile(std::string const& version_file,
       unsigned int parsed_patch;
       unsigned int parsed_tweak;
       this->VersionFoundCount =
-        sscanf(this->VersionFound.c_str(), "%u.%u.%u.%u", &parsed_major,
-               &parsed_minor, &parsed_patch, &parsed_tweak);
+        parseVersion(this->VersionFound, parsed_major, parsed_minor,
+                     parsed_patch, parsed_tweak);
       switch (this->VersionFoundCount) {
         case 4:
           this->VersionFoundTweak = parsed_tweak;
-- 
cgit v0.12


From 66c3932e588f336a56a97794cb68183bfbba7471 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 27 Jun 2022 10:00:34 +0400
Subject: cmFindPackageCommand: Move comment inside the `else if` block

---
 Source/cmFindPackageCommand.cxx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 70c73ad..ec5b58e 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -140,10 +140,9 @@ void cmFindPackageCommand::Sort(std::vector<std::string>::iterator begin,
     } else {
       std::sort(begin, end);
     }
-  } else if (order == Natural)
-  // natural order uses letters and numbers (contiguous numbers digit are
-  // compared such that e.g. 000  00 < 01 < 010 < 09 < 0 < 1 < 9 < 10
-  {
+  } else if (order == Natural) {
+    // natural order uses letters and numbers (contiguous numbers digit are
+    // compared such that e.g. 000  00 < 01 < 010 < 09 < 0 < 1 < 9 < 10
     if (dir == Dec) {
       std::sort(begin, end, StrverscmpOp<std::greater>());
     } else {
-- 
cgit v0.12


From 5be13907a0226bb312ba6a20afccefc9dc2266da Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 27 Jun 2022 10:10:03 +0400
Subject: cmFindPackageCommand: Use `vector` instead of `set` to store arg
 indices

They are unique by design. I.e., when the algorithm iterates over
args doing only one push per iteration indices gonna be unique ;-)
So, no need for `std::set` here.
---
 Source/cmFindPackageCommand.cxx | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index ec5b58e..8a3fde1 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -75,7 +75,7 @@ std::size_t collectPathsForDebug(std::string& buffer,
     buffer += "  none\n";
     return 0;
   }
-  for (std::size_t i = startIndex; i < paths.size(); i++) {
+  for (auto i = startIndex; i < paths.size(); i++) {
     buffer += "  " + paths[i].Path + "\n";
   }
   return paths.size();
@@ -317,9 +317,9 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
   cmsys::RegularExpression versionRegex(
     R"V(^([0-9]+(\.[0-9]+)*)(\.\.\.(<?)([0-9]+(\.[0-9]+)*))?$)V");
   bool haveVersion = false;
-  std::set<unsigned int> configArgs;
-  std::set<unsigned int> moduleArgs;
-  for (unsigned int i = 1; i < args.size(); ++i) {
+  std::vector<std::size_t> configArgs;
+  std::vector<std::size_t> moduleArgs;
+  for (std::size_t i = 1u; i < args.size(); ++i) {
     if (args[i] == "QUIET") {
       this->Quiet = true;
       doing = DoingNone;
@@ -333,17 +333,17 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
       this->GlobalScope = true;
       doing = DoingNone;
     } else if (args[i] == "MODULE") {
-      moduleArgs.insert(i);
+      moduleArgs.push_back(i);
       doing = DoingNone;
       // XXX(clang-tidy): https://bugs.llvm.org/show_bug.cgi?id=44165
       // NOLINTNEXTLINE(bugprone-branch-clone)
     } else if (args[i] == "CONFIG") {
-      configArgs.insert(i);
+      configArgs.push_back(i);
       doing = DoingNone;
       // XXX(clang-tidy): https://bugs.llvm.org/show_bug.cgi?id=44165
       // NOLINTNEXTLINE(bugprone-branch-clone)
     } else if (args[i] == "NO_MODULE") {
-      configArgs.insert(i);
+      configArgs.push_back(i);
       doing = DoingNone;
     } else if (args[i] == "REQUIRED") {
       this->Required = true;
@@ -353,36 +353,36 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
     } else if (args[i] == "OPTIONAL_COMPONENTS") {
       doing = DoingOptionalComponents;
     } else if (args[i] == "NAMES") {
-      configArgs.insert(i);
+      configArgs.push_back(i);
       doing = DoingNames;
     } else if (args[i] == "PATHS") {
-      configArgs.insert(i);
+      configArgs.push_back(i);
       doing = DoingPaths;
     } else if (args[i] == "HINTS") {
-      configArgs.insert(i);
+      configArgs.push_back(i);
       doing = DoingHints;
     } else if (args[i] == "PATH_SUFFIXES") {
-      configArgs.insert(i);
+      configArgs.push_back(i);
       doing = DoingPathSuffixes;
     } else if (args[i] == "CONFIGS") {
-      configArgs.insert(i);
+      configArgs.push_back(i);
       doing = DoingConfigs;
     } else if (args[i] == "NO_POLICY_SCOPE") {
       this->PolicyScope = false;
       doing = DoingNone;
     } else if (args[i] == "NO_CMAKE_PACKAGE_REGISTRY") {
       this->NoUserRegistry = true;
-      configArgs.insert(i);
+      configArgs.push_back(i);
       doing = DoingNone;
     } else if (args[i] == "NO_CMAKE_SYSTEM_PACKAGE_REGISTRY") {
       this->NoSystemRegistry = true;
-      configArgs.insert(i);
+      configArgs.push_back(i);
       doing = DoingNone;
       // XXX(clang-tidy): https://bugs.llvm.org/show_bug.cgi?id=44165
       // NOLINTNEXTLINE(bugprone-branch-clone)
     } else if (args[i] == "NO_CMAKE_BUILDS_PATH") {
       // Ignore legacy option.
-      configArgs.insert(i);
+      configArgs.push_back(i);
       doing = DoingNone;
     } else if (args[i] == "REGISTRY_VIEW") {
       if (++i == args.size()) {
@@ -399,7 +399,7 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
         return false;
       }
     } else if (this->CheckCommonArgument(args[i])) {
-      configArgs.insert(i);
+      configArgs.push_back(i);
       doing = DoingNone;
     } else if ((doing == DoingComponents) ||
                (doing == DoingOptionalComponents)) {
@@ -472,11 +472,11 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
   if (!this->UseFindModules && !this->UseConfigFiles) {
     std::ostringstream e;
     e << "given options exclusive to Module mode:\n";
-    for (unsigned int si : moduleArgs) {
+    for (auto si : moduleArgs) {
       e << "  " << args[si] << "\n";
     }
     e << "and options exclusive to Config mode:\n";
-    for (unsigned int si : configArgs) {
+    for (auto si : configArgs) {
       e << "  " << args[si] << "\n";
     }
     e << "The options are incompatible.";
-- 
cgit v0.12


From 898ba76d1bb2a5f728c9f9dfd377de7593a4d6f5 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Sun, 3 Jul 2022 22:35:32 +0400
Subject: cmFindPackageCommand: Drop redundant `std::ostream::operator<<` calls

---
 Source/cmFindPackageCommand.cxx | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 8a3fde1..068fbf8 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -768,11 +768,8 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
                 "package configuration file provided by "
              << this->Name << " (" << this->Name << "Config.cmake or "
              << cmSystemTools::LowerCase(this->Name)
-             << "-config.cmake).  "
-                "Otherwise make Find"
-             << this->Name
-             << ".cmake available in "
-                "CMAKE_MODULE_PATH.";
+             << "-config.cmake).  Otherwise make Find" << this->Name
+             << ".cmake available in CMAKE_MODULE_PATH.";
         }
         aw << "\n"
               "(Variable CMAKE_FIND_PACKAGE_WARN_NO_MODULE enabled this "
@@ -1167,8 +1164,9 @@ bool cmFindPackageCommand::HandlePackageMode(
           << (this->VersionExact ? "exactly matches" : "is compatible with")
           << " requested version "
           << (this->VersionRange.empty() ? "" : "range ") << "\""
-          << this->VersionComplete << "\".\n"
-          << "The following configuration files were considered but not "
+          << this->VersionComplete
+          << "\".\n"
+             "The following configuration files were considered but not "
              "accepted:\n";
 
         for (ConfigFileInfo const& info :
@@ -1216,8 +1214,9 @@ bool cmFindPackageCommand::HandlePackageMode(
                "package or SDK, be sure it has been installed.";
         } else // if(!this->UseFindModules && !this->UseConfigFiles)
         {
-          e << "No \"Find" << this->Name << ".cmake\" found in "
-            << "CMAKE_MODULE_PATH.";
+          e << "No \"Find" << this->Name
+            << ".cmake\" found in "
+               "CMAKE_MODULE_PATH.";
 
           aw
             << "Find" << this->Name
-- 
cgit v0.12


From 468d04ef1444360cc95f685783bab9dc0e7ac43a Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 4 Jul 2022 06:11:46 +0400
Subject: cmFindPackageCommand: Move methods implementation into the class
 definition

---
 Source/cmFindPackageCommand.cxx | 43 +++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 068fbf8..afc63a5 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -2157,14 +2157,27 @@ public:
 
 protected:
   bool Consider(std::string const& fullPath, cmFileList& listing);
-  static bool IsIgnoredEntry(const char* fname);
+  static bool IsIgnoredEntry(const char* fname)
+  {
+    assert(fname != nullptr);
+    assert(fname[0] != 0);
+    return fname[0] == '.' &&
+      (fname[1] == 0 || (fname[1] == '.' && fname[2] == 0));
+  }
 
 private:
-  bool Search(cmFileList&);
-  virtual bool Search(std::string const& parent, cmFileList&) = 0;
-  virtual std::unique_ptr<cmFileListGeneratorBase> Clone() const = 0;
   friend class cmFileList;
-  cmFileListGeneratorBase* SetNext(cmFileListGeneratorBase const& next);
+  virtual std::unique_ptr<cmFileListGeneratorBase> Clone() const = 0;
+  virtual bool Search(std::string const& parent, cmFileList&) = 0;
+  bool Search(cmFileList& listing)
+  {
+    return this->Search(std::string{}, listing);
+  }
+  cmFileListGeneratorBase* SetNext(cmFileListGeneratorBase const& next)
+  {
+    this->Next = next.Clone();
+    return this->Next.get();
+  }
   std::unique_ptr<cmFileListGeneratorBase> Next;
 };
 
@@ -2191,18 +2204,6 @@ private:
   cmFileListGeneratorBase* Last = nullptr;
 };
 
-bool cmFileListGeneratorBase::Search(cmFileList& listing)
-{
-  return this->Search(std::string{}, listing);
-}
-
-cmFileListGeneratorBase* cmFileListGeneratorBase::SetNext(
-  cmFileListGeneratorBase const& next)
-{
-  this->Next = next.Clone();
-  return this->Next.get();
-}
-
 bool cmFileListGeneratorBase::Consider(std::string const& fullPath,
                                        cmFileList& listing)
 {
@@ -2214,14 +2215,6 @@ bool cmFileListGeneratorBase::Consider(std::string const& fullPath,
   }
   return listing.Visit(fullPath + '/');
 }
-
-bool cmFileListGeneratorBase::IsIgnoredEntry(const char* const fname)
-{
-  assert(fname != nullptr);
-  assert(fname[0] != 0);
-  return fname[0] == '.' &&
-    (fname[1] == 0 || (fname[1] == '.' && fname[2] == 0));
-}
 } // anonymous namespace
 
 class cmFindPackageFileList : public cmFileList
-- 
cgit v0.12


From ef62f213f8c24d58c28ee1812887fc77667ead47 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 4 Jul 2022 06:43:55 +0400
Subject: cmFindPackageCommand: Drop dead code

The `cmFindPackageFileList` instances always constructed w/ the only
parameter. The boolean flag is always `true` (default value).

Also, `cmFindPackageCommand::InitialPass` adds an empty string
to the `cmFindPackageCommand::SearchPathSuffixes` vector. Meaning
that `cmFindPackageCommand::CheckDirectory()` gonna be called for
the suffix-less path, so `cmFindPackageFileList::Visit` may call
only `cmFindPackageCommand::SearchDirectory` and get the same result.
---
 Source/cmFindPackageCommand.cxx | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index afc63a5..f955653 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -2220,23 +2220,17 @@ bool cmFileListGeneratorBase::Consider(std::string const& fullPath,
 class cmFindPackageFileList : public cmFileList
 {
 public:
-  cmFindPackageFileList(cmFindPackageCommand* const fpc,
-                        bool const use_suffixes = true)
+  cmFindPackageFileList(cmFindPackageCommand* const fpc)
     : FPC(fpc)
-    , UseSuffixes(use_suffixes)
   {
   }
 
 private:
   bool Visit(std::string const& fullPath) override
   {
-    if (this->UseSuffixes) {
-      return this->FPC->SearchDirectory(fullPath);
-    }
-    return this->FPC->CheckDirectory(fullPath);
+    return this->FPC->SearchDirectory(fullPath);
   }
   cmFindPackageCommand* const FPC;
-  bool const UseSuffixes;
 };
 
 namespace {
-- 
cgit v0.12


From 61eb5d4de54c1fd2c05ac51d9f604a4d7ad4380b Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Mon, 4 Jul 2022 07:21:05 +0400
Subject: cmFindPackageCommand: Avoid friendship between command class and
 generator

---
 Source/cmFindPackageCommand.cxx | 55 +++++++++++++++++++++++++----------------
 Source/cmFindPackageCommand.h   |  2 --
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index f955653..969f59c 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -2147,6 +2147,7 @@ void cmFindPackageCommand::StoreVersionFound()
   }
 }
 
+// BEGIN File paths generators
 namespace {
 class cmFileList;
 
@@ -2215,25 +2216,24 @@ bool cmFileListGeneratorBase::Consider(std::string const& fullPath,
   }
   return listing.Visit(fullPath + '/');
 }
-} // anonymous namespace
 
 class cmFindPackageFileList : public cmFileList
 {
 public:
-  cmFindPackageFileList(cmFindPackageCommand* const fpc)
-    : FPC(fpc)
+  using SearchFn = std::function<bool(const std::string&)>;
+  cmFindPackageFileList(const SearchFn search)
+    : searchFn(search)
   {
   }
 
 private:
   bool Visit(std::string const& fullPath) override
   {
-    return this->FPC->SearchDirectory(fullPath);
+    return this->searchFn(fullPath);
   }
-  cmFindPackageCommand* const FPC;
+  const SearchFn searchFn;
 };
 
-namespace {
 class cmFileListGeneratorFixed : public cmFileListGeneratorBase
 {
 public:
@@ -2486,6 +2486,7 @@ private:
   }
 };
 } // anonymous namespace
+// END File paths generators
 
 bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
 {
@@ -2515,9 +2516,13 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
   // add one.
   std::string const prefix = prefix_in.substr(0, prefix_in.size() - 1);
 
+  auto searchFn = [this](const std::string& fullPath) -> bool {
+    return this->SearchDirectory(fullPath);
+  };
+
   //  PREFIX/(cmake|CMake)/ (useful on windows or in build trees)
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorCaseInsensitive("cmake");
     if (lister.Search()) {
@@ -2527,7 +2532,7 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
 
   //  PREFIX/(Foo|foo|FOO).*/
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorProject(this->Names, this->SortOrder,
                                  this->SortDirection);
@@ -2538,7 +2543,7 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
 
   //  PREFIX/(Foo|foo|FOO).*/(cmake|CMake)/
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorProject(this->Names, this->SortOrder,
                                  this->SortDirection) /
@@ -2567,7 +2572,7 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
 
   //  PREFIX/(lib/ARCH|lib*|share)/cmake/(Foo|foo|FOO).*/
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorEnumerate(common) /
       cmFileListGeneratorFixed("cmake") /
@@ -2580,7 +2585,7 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
 
   //  PREFIX/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorEnumerate(common) /
       cmFileListGeneratorProject(this->Names, this->SortOrder,
@@ -2592,7 +2597,7 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
 
   //  PREFIX/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/(cmake|CMake)/
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorEnumerate(common) /
       cmFileListGeneratorProject(this->Names, this->SortOrder,
@@ -2605,7 +2610,7 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
 
   // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/cmake/(Foo|foo|FOO).*/
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorProject(this->Names, this->SortOrder,
                                  this->SortDirection) /
@@ -2620,7 +2625,7 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
 
   // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorProject(this->Names, this->SortOrder,
                                  this->SortDirection) /
@@ -2634,7 +2639,7 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
 
   // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/(cmake|CMake)/
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorProject(this->Names, this->SortOrder,
                                  this->SortDirection) /
@@ -2658,9 +2663,13 @@ bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in)
   // add one.
   std::string const prefix = prefix_in.substr(0, prefix_in.size() - 1);
 
+  auto searchFn = [this](const std::string& fullPath) -> bool {
+    return this->SearchDirectory(fullPath);
+  };
+
   // <prefix>/Foo.framework/Resources/
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorMacProject(this->Names, ".framework") /
       cmFileListGeneratorFixed("Resources");
@@ -2670,7 +2679,7 @@ bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in)
   }
   // <prefix>/Foo.framework/Resources/CMake/
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorMacProject(this->Names, ".framework") /
       cmFileListGeneratorFixed("Resources") /
@@ -2682,7 +2691,7 @@ bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in)
 
   // <prefix>/Foo.framework/Versions/*/Resources/
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorMacProject(this->Names, ".framework") /
       cmFileListGeneratorFixed("Versions") /
@@ -2694,7 +2703,7 @@ bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in)
 
   // <prefix>/Foo.framework/Versions/*/Resources/CMake/
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorMacProject(this->Names, ".framework") /
       cmFileListGeneratorFixed("Versions") /
@@ -2716,9 +2725,13 @@ bool cmFindPackageCommand::SearchAppBundlePrefix(std::string const& prefix_in)
   // add one.
   std::string const prefix = prefix_in.substr(0, prefix_in.size() - 1);
 
+  auto searchFn = [this](const std::string& fullPath) -> bool {
+    return this->SearchDirectory(fullPath);
+  };
+
   // <prefix>/Foo.app/Contents/Resources
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorMacProject(this->Names, ".app") /
       cmFileListGeneratorFixed("Contents/Resources");
@@ -2729,7 +2742,7 @@ bool cmFindPackageCommand::SearchAppBundlePrefix(std::string const& prefix_in)
 
   // <prefix>/Foo.app/Contents/Resources/CMake
   {
-    cmFindPackageFileList lister(this);
+    cmFindPackageFileList lister(searchFn);
     lister / cmFileListGeneratorFixed(prefix) /
       cmFileListGeneratorMacProject(this->Names, ".app") /
       cmFileListGeneratorFixed("Contents/Resources") /
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h
index 80fd8f8..28e00a1 100644
--- a/Source/cmFindPackageCommand.h
+++ b/Source/cmFindPackageCommand.h
@@ -153,8 +153,6 @@ private:
   bool SearchFrameworkPrefix(std::string const& prefix_in);
   bool SearchAppBundlePrefix(std::string const& prefix_in);
 
-  friend class cmFindPackageFileList;
-
   struct OriginalDef
   {
     bool exists;
-- 
cgit v0.12


From 08e7fb3cfa80775ea8e50862180e4c3da6af9717 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Tue, 5 Jul 2022 02:08:56 +0400
Subject: cmFindPackageCommand: Compile-time path generator expressions

Original code had path generators built at run-time using a linked list
of dynamically allocated nodes each of which was responsible to generate
a path segment.

However, the combination of used generators is totally well known at
compile time.
---
 CTestCustom.cmake.in            |   1 +
 Source/cmFindPackageCommand.cxx | 930 +++++++++++++++++++---------------------
 2 files changed, 435 insertions(+), 496 deletions(-)

diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index 49026a3..967e1bf 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -74,6 +74,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
   "cm(StringCommand|CTestTestHandler)\\.cxx.*warning.*rand.*may return deterministic values"
   "cm(StringCommand|CTestTestHandler)\\.cxx.*warning.*rand.*isn.*t random" # we do not do crypto
   "cm(StringCommand|CTestTestHandler)\\.cxx.*warning.*srand.*seed choices are.*poor" # we do not do crypto
+  "cmFindPackageCommand.cxx.*: warning #177-D: parameter .* was declared but never referenced"
   "IPA warning: function.*multiply defined in"
   "LICENSE WARNING" # PGI license expiry.  Not useful in nightly testing.
 
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 969f59c..edea44e 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -104,6 +104,335 @@ public:
 };
 #endif
 
+bool isDirentryToIgnore(const char* const fname)
+{
+  assert(fname != nullptr);
+  assert(fname[0] != 0);
+  return fname[0] == '.' &&
+    (fname[1] == 0 || (fname[1] == '.' && fname[2] == 0));
+}
+
+class cmFixedStringGenerator
+{
+public:
+  cmFixedStringGenerator(cm::string_view dirName)
+    : DirName{ dirName }
+  {
+  }
+
+  std::string GetNextCandidate(const std::string& parent)
+  {
+    if (this->NeedReset) {
+      return {};
+    }
+    this->NeedReset = true;
+    return cmStrCat(parent, '/', this->DirName);
+  }
+
+  void Reset() { this->NeedReset = false; }
+
+private:
+  const cm::string_view DirName;
+  bool NeedReset = false;
+};
+
+class cmEnumFixedStringsGenerator
+{
+public:
+  cmEnumFixedStringsGenerator(const std::vector<cm::string_view>& init)
+    : Names{ init }
+    , Current{ this->Names.get().cbegin() }
+  {
+  }
+
+  std::string GetNextCandidate(const std::string& parent)
+  {
+    if (this->Current != this->Names.get().cend()) {
+      return cmStrCat(parent, '/', *this->Current++);
+    }
+    return {};
+  }
+
+  void Reset() { this->Current = this->Names.get().cbegin(); }
+
+private:
+  std::reference_wrapper<const std::vector<cm::string_view>> Names;
+  std::vector<cm::string_view>::const_iterator Current;
+};
+
+class cmFileListGeneratorCaseInsensitive
+{
+public:
+  cmFileListGeneratorCaseInsensitive(cm::string_view name)
+    : DirectoryLister{}
+    , DirName{ name }
+  {
+  }
+
+  std::string GetNextCandidate(const std::string& parent)
+  {
+    if (!this->Loaded) {
+      this->CurrentIdx = 0ul;
+      this->Loaded = true;
+      if (!this->DirectoryLister.Load(parent)) {
+        return {};
+      }
+    }
+
+    while (this->CurrentIdx < this->DirectoryLister.GetNumberOfFiles()) {
+      const char* const fname =
+        this->DirectoryLister.GetFile(this->CurrentIdx++);
+      if (isDirentryToIgnore(fname)) {
+        continue;
+      }
+      if (cmsysString_strcasecmp(fname, this->DirName.data()) == 0) {
+        auto candidate = cmStrCat(parent, '/', fname);
+        if (cmSystemTools::FileIsDirectory(candidate)) {
+          return candidate;
+        }
+      }
+    }
+    return {};
+  }
+
+  void Reset() { this->Loaded = false; }
+
+private:
+  cmsys::Directory DirectoryLister;
+  const cm::string_view DirName;
+  unsigned long CurrentIdx = 0ul;
+  bool Loaded = false;
+};
+
+class cmFileListGeneratorProject
+{
+public:
+  cmFileListGeneratorProject(std::vector<std::string> const& names,
+                             cmFindPackageCommand::SortOrderType so,
+                             cmFindPackageCommand::SortDirectionType sd)
+    : Names{ names }
+    , Matches{}
+    , Current{ this->Matches.cbegin() }
+    , SortOrder{ so }
+    , SortDirection{ sd }
+  {
+  }
+
+  std::string GetNextCandidate(const std::string& parent)
+  {
+    // Construct a list of matches if not yet
+    if (this->Matches.empty()) {
+      cmsys::Directory directoryLister;
+      directoryLister.Load(parent);
+      for (auto i = 0ul; i < directoryLister.GetNumberOfFiles(); ++i) {
+        const char* const fname = directoryLister.GetFile(i);
+        if (isDirentryToIgnore(fname)) {
+          continue;
+        }
+        for (const auto& name : this->Names.get()) {
+          // Skip entries that don't match and non-directories.
+          // ATTENTION BTW, original code also didn't check if it's a symlink
+          // to a directory! ALERT `Directory::Load()` keep only names
+          // internally and LOST entry type So `Directory::FileIsDirectory`
+          // gonna use `SystemTools::FileIsDirectory()` (wasing a syscall)
+          // again!
+          if (cmsysString_strncasecmp(fname, name.c_str(), name.length()) ==
+                0 &&
+              directoryLister.FileIsDirectory(i)) {
+            this->Matches.emplace_back(fname);
+          }
+        }
+      }
+      // check if there is a specific sorting order to perform
+      if (this->SortOrder != cmFindPackageCommand::None) {
+        cmFindPackageCommand::Sort(this->Matches.begin(), this->Matches.end(),
+                                   this->SortOrder, this->SortDirection);
+      }
+      this->Current = this->Matches.cbegin();
+    }
+    if (this->Current != this->Matches.cend()) {
+      auto candidate = cmStrCat(parent, '/', *this->Current++);
+      return candidate;
+    }
+    return {};
+  }
+
+  void Reset()
+  {
+    this->Matches.clear();
+    this->Current = this->Matches.cbegin();
+  }
+
+private:
+  std::reference_wrapper<const std::vector<std::string>> Names;
+  std::vector<std::string> Matches;
+  std::vector<std::string>::const_iterator Current;
+  // sort parameters
+  const cmFindPackageCommand::SortOrderType SortOrder;
+  const cmFindPackageCommand::SortDirectionType SortDirection;
+};
+
+class cmFileListGeneratorMacProject
+{
+public:
+  cmFileListGeneratorMacProject(const std::vector<std::string>& names,
+                                cm::string_view ext)
+    : Names{ names }
+    , Extension{ ext }
+    , Matches{}
+    , Current{ this->Matches.cbegin() }
+  {
+  }
+
+  std::string GetNextCandidate(const std::string& parent)
+  {
+    // Construct a list of matches if not yet
+    if (this->Matches.empty()) {
+      cmsys::Directory directoryLister;
+      directoryLister.Load(parent);
+      for (auto i = 0ul; i < directoryLister.GetNumberOfFiles(); ++i) {
+        const char* const fname = directoryLister.GetFile(i);
+        if (isDirentryToIgnore(fname)) {
+          continue;
+        }
+        for (auto name : this->Names.get()) {
+          name += this->Extension;
+          // Skip entries that don't match and non-directories.
+          // ATTENTION BTW, original code also didn't check if it's a symlink
+          // to a directory! ALERT `Directory::Load()` keep only names
+          // internally and LOST entry type So `Directory::FileIsDirectory`
+          // gonna use `SystemTools::FileIsDirectory()` (wasing a syscall)
+          // again!
+          if (cmsysString_strncasecmp(fname, name.c_str(), name.length()) ==
+                0 &&
+              directoryLister.FileIsDirectory(i)) {
+            this->Matches.emplace_back(fname);
+          }
+        }
+      }
+      this->Current = this->Matches.cbegin();
+    }
+    if (this->Current != this->Matches.cend()) {
+      auto candidate = cmStrCat(parent, '/', *this->Current++);
+      return candidate;
+    }
+    return {};
+  }
+
+  void Reset()
+  {
+    this->Matches.clear();
+    this->Current = this->Matches.cbegin();
+  }
+
+private:
+  std::reference_wrapper<const std::vector<std::string>> Names;
+  const cm::string_view Extension;
+  std::vector<std::string> Matches;
+  std::vector<std::string>::const_iterator Current;
+};
+
+class cmFileListGeneratorGlob
+{
+public:
+  cmFileListGeneratorGlob(cm::string_view pattern)
+    : Pattern(pattern)
+    , Files{}
+    , Current{}
+  {
+  }
+
+  std::string GetNextCandidate(const std::string& parent)
+  {
+    if (this->Files.empty()) {
+      // Glob the set of matching files.
+      std::string expr = cmStrCat(parent, this->Pattern);
+      cmsys::Glob g;
+      if (!g.FindFiles(expr)) {
+        return {};
+      }
+      this->Files = g.GetFiles();
+      this->Current = this->Files.cbegin();
+    }
+
+    // Skip non-directories
+    for (; this->Current != this->Files.cend() &&
+         !cmSystemTools::FileIsDirectory(*this->Current);
+         ++this->Current) {
+    }
+
+    return (this->Current != this->Files.cend()) ? *this->Current++
+                                                 : std::string{};
+  }
+
+  void Reset()
+  {
+    this->Files.clear();
+    this->Current = this->Files.cbegin();
+  }
+
+private:
+  cm::string_view Pattern;
+  std::vector<std::string> Files;
+  std::vector<std::string>::const_iterator Current;
+};
+
+#if defined(__LCC__)
+#  define CM_LCC_DIAG_SUPPRESS_1222
+#  pragma diag_suppress 1222 // invalid error number (3288, but works anyway)
+#  define CM_LCC_DIAG_SUPPRESS_3288
+#  pragma diag_suppress 3288 // parameter was declared but never referenced
+#endif
+
+void ResetGenerator()
+{
+}
+
+template <typename T>
+void ResetGenerator(T&& g)
+{
+  std::forward<T&&>(g).Reset();
+}
+
+template <typename T, typename... Ts>
+void ResetGenerator(T&& g, Ts&&... tail)
+{
+  ResetGenerator(std::forward<T&&>(g));
+  ResetGenerator(std::forward<Ts&&>(tail)...);
+}
+
+template <typename Fn>
+bool TryGeneratedPaths(Fn&& checker, const std::string& fullPath)
+{
+  assert(!fullPath.empty() && fullPath.back() != '/');
+  return std::forward<Fn&&>(checker)(fullPath + '/');
+}
+
+template <typename Fn, typename Generator, typename... Rest>
+bool TryGeneratedPaths(Fn&& checker, const std::string& startPath,
+                       Generator&& gen, Rest&&... tail)
+{
+  for (auto path = gen.GetNextCandidate(startPath); !path.empty();
+       path = gen.GetNextCandidate(startPath)) {
+    ResetGenerator(std::forward<Rest&&>(tail)...);
+    if (TryGeneratedPaths(std::forward<Fn&&>(checker), path,
+                          std::forward<Rest&&>(tail)...)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+#ifdef CM_LCC_DIAG_SUPPRESS_3288
+#  undef CM_LCC_DIAG_SUPPRESS_3288
+#  pragma diag_default 3288
+#endif
+
+#ifdef CM_LCC_DIAG_SUPPRESS_1222
+#  undef CM_LCC_DIAG_SUPPRESS_1222
+#  pragma diag_default 1222
+#endif
+
 // Parse the version number and store the results that were
 // successfully parsed.
 int parseVersion(const std::string& version, unsigned int& major,
@@ -2147,347 +2476,6 @@ void cmFindPackageCommand::StoreVersionFound()
   }
 }
 
-// BEGIN File paths generators
-namespace {
-class cmFileList;
-
-class cmFileListGeneratorBase
-{
-public:
-  virtual ~cmFileListGeneratorBase() = default;
-
-protected:
-  bool Consider(std::string const& fullPath, cmFileList& listing);
-  static bool IsIgnoredEntry(const char* fname)
-  {
-    assert(fname != nullptr);
-    assert(fname[0] != 0);
-    return fname[0] == '.' &&
-      (fname[1] == 0 || (fname[1] == '.' && fname[2] == 0));
-  }
-
-private:
-  friend class cmFileList;
-  virtual std::unique_ptr<cmFileListGeneratorBase> Clone() const = 0;
-  virtual bool Search(std::string const& parent, cmFileList&) = 0;
-  bool Search(cmFileList& listing)
-  {
-    return this->Search(std::string{}, listing);
-  }
-  cmFileListGeneratorBase* SetNext(cmFileListGeneratorBase const& next)
-  {
-    this->Next = next.Clone();
-    return this->Next.get();
-  }
-  std::unique_ptr<cmFileListGeneratorBase> Next;
-};
-
-class cmFileList
-{
-public:
-  virtual ~cmFileList() = default;
-  cmFileList& operator/(cmFileListGeneratorBase const& rhs)
-  {
-    if (this->Last) {
-      this->Last = this->Last->SetNext(rhs);
-    } else {
-      this->First = rhs.Clone();
-      this->Last = this->First.get();
-    }
-    return *this;
-  }
-  bool Search() { return this->First && this->First->Search(*this); }
-
-private:
-  virtual bool Visit(std::string const& fullPath) = 0;
-  friend class cmFileListGeneratorBase;
-  std::unique_ptr<cmFileListGeneratorBase> First;
-  cmFileListGeneratorBase* Last = nullptr;
-};
-
-bool cmFileListGeneratorBase::Consider(std::string const& fullPath,
-                                       cmFileList& listing)
-{
-  if (!fullPath.empty() && !cmSystemTools::FileIsDirectory(fullPath)) {
-    return false;
-  }
-  if (this->Next) {
-    return this->Next->Search(fullPath + '/', listing);
-  }
-  return listing.Visit(fullPath + '/');
-}
-
-class cmFindPackageFileList : public cmFileList
-{
-public:
-  using SearchFn = std::function<bool(const std::string&)>;
-  cmFindPackageFileList(const SearchFn search)
-    : searchFn(search)
-  {
-  }
-
-private:
-  bool Visit(std::string const& fullPath) override
-  {
-    return this->searchFn(fullPath);
-  }
-  const SearchFn searchFn;
-};
-
-class cmFileListGeneratorFixed : public cmFileListGeneratorBase
-{
-public:
-  cmFileListGeneratorFixed(std::string str)
-    : String(std::move(str))
-  {
-  }
-  cmFileListGeneratorFixed(cmFileListGeneratorFixed const& r)
-    : String(r.String)
-  {
-  }
-
-private:
-  std::string String;
-  bool Search(std::string const& parent, cmFileList& lister) override
-  {
-    std::string fullPath = parent + this->String;
-    return this->Consider(fullPath, lister);
-  }
-  std::unique_ptr<cmFileListGeneratorBase> Clone() const override
-  {
-    std::unique_ptr<cmFileListGeneratorBase> g(
-      new cmFileListGeneratorFixed(*this));
-    return g;
-  }
-};
-
-class cmFileListGeneratorEnumerate : public cmFileListGeneratorBase
-{
-public:
-  cmFileListGeneratorEnumerate(std::vector<std::string> const& v)
-    : Vector(v)
-  {
-  }
-  cmFileListGeneratorEnumerate(cmFileListGeneratorEnumerate const& r)
-    : Vector(r.Vector)
-  {
-  }
-
-private:
-  std::vector<std::string> const& Vector;
-  bool Search(std::string const& parent, cmFileList& lister) override
-  {
-    return std::any_of(this->Vector.cbegin(), this->Vector.cend(),
-                       [this, &parent, &lister](std::string const& i) {
-                         return this->Consider(parent + i, lister);
-                       });
-  }
-  std::unique_ptr<cmFileListGeneratorBase> Clone() const override
-  {
-    std::unique_ptr<cmFileListGeneratorBase> g(
-      new cmFileListGeneratorEnumerate(*this));
-    return g;
-  }
-};
-
-class cmFileListGeneratorProject : public cmFileListGeneratorBase
-{
-public:
-  cmFileListGeneratorProject(std::vector<std::string> const& names,
-                             cmFindPackageCommand::SortOrderType so,
-                             cmFindPackageCommand::SortDirectionType sd)
-    : Names(names)
-  {
-    this->SetSort(so, sd);
-  }
-  cmFileListGeneratorProject(cmFileListGeneratorProject const& r)
-    : Names(r.Names)
-  {
-    this->SetSort(r.SortOrder, r.SortDirection);
-  }
-
-  void SetSort(cmFindPackageCommand::SortOrderType o,
-               cmFindPackageCommand::SortDirectionType d)
-  {
-    this->SortOrder = o;
-    this->SortDirection = d;
-  }
-
-protected:
-  // sort parameters
-  cmFindPackageCommand::SortOrderType SortOrder;
-  cmFindPackageCommand::SortDirectionType SortDirection;
-
-private:
-  std::vector<std::string> const& Names;
-  bool Search(std::string const& parent, cmFileList& lister) override
-  {
-    // Construct a list of matches.
-    std::vector<std::string> matches;
-    cmsys::Directory d;
-    d.Load(parent);
-    for (unsigned long i = 0; i < d.GetNumberOfFiles(); ++i) {
-      const char* const fname = d.GetFile(i);
-      if (this->IsIgnoredEntry(fname)) {
-        continue;
-      }
-      for (std::string const& n : this->Names) {
-        if (cmsysString_strncasecmp(fname, n.c_str(), n.length()) == 0) {
-          matches.emplace_back(fname);
-        }
-      }
-    }
-
-    // before testing the matches check if there is a specific sorting order to
-    // perform
-    if (this->SortOrder != cmFindPackageCommand::None) {
-      cmFindPackageCommand::Sort(matches.begin(), matches.end(),
-                                 this->SortOrder, this->SortDirection);
-    }
-
-    return std::any_of(matches.cbegin(), matches.cend(),
-                       [this, &parent, &lister](std::string const& i) {
-                         return this->Consider(parent + i, lister);
-                       });
-  }
-  std::unique_ptr<cmFileListGeneratorBase> Clone() const override
-  {
-    std::unique_ptr<cmFileListGeneratorBase> g(
-      new cmFileListGeneratorProject(*this));
-    return g;
-  }
-};
-
-class cmFileListGeneratorMacProject : public cmFileListGeneratorBase
-{
-public:
-  cmFileListGeneratorMacProject(std::vector<std::string> const& names,
-                                const char* ext)
-    : Names(names)
-    , Extension(ext)
-  {
-  }
-  cmFileListGeneratorMacProject(cmFileListGeneratorMacProject const& r)
-    : Names(r.Names)
-    , Extension(r.Extension)
-  {
-  }
-
-private:
-  std::vector<std::string> const& Names;
-  std::string Extension;
-  bool Search(std::string const& parent, cmFileList& lister) override
-  {
-    // Construct a list of matches.
-    std::vector<std::string> matches;
-    cmsys::Directory d;
-    d.Load(parent);
-    for (unsigned long i = 0; i < d.GetNumberOfFiles(); ++i) {
-      const char* const fname = d.GetFile(i);
-      if (this->IsIgnoredEntry(fname)) {
-        continue;
-      }
-      for (std::string name : this->Names) {
-        name += this->Extension;
-        if (cmsysString_strcasecmp(fname, name.c_str()) == 0) {
-          matches.emplace_back(fname);
-        }
-      }
-    }
-
-    return std::any_of(matches.cbegin(), matches.cend(),
-                       [this, &parent, &lister](std::string const& i) {
-                         return this->Consider(parent + i, lister);
-                       });
-  }
-  std::unique_ptr<cmFileListGeneratorBase> Clone() const override
-  {
-    std::unique_ptr<cmFileListGeneratorBase> g(
-      new cmFileListGeneratorMacProject(*this));
-    return g;
-  }
-};
-
-class cmFileListGeneratorCaseInsensitive : public cmFileListGeneratorBase
-{
-public:
-  cmFileListGeneratorCaseInsensitive(std::string str)
-    : String(std::move(str))
-  {
-  }
-  cmFileListGeneratorCaseInsensitive(
-    cmFileListGeneratorCaseInsensitive const& r)
-    : String(r.String)
-  {
-  }
-
-private:
-  std::string String;
-  bool Search(std::string const& parent, cmFileList& lister) override
-  {
-    // Look for matching files.
-    std::vector<std::string> matches;
-    cmsys::Directory d;
-    d.Load(parent);
-    for (unsigned long i = 0; i < d.GetNumberOfFiles(); ++i) {
-      const char* fname = d.GetFile(i);
-      if (this->IsIgnoredEntry(fname)) {
-        continue;
-      }
-      if (cmsysString_strcasecmp(fname, this->String.c_str()) == 0) {
-        if (this->Consider(parent + fname, lister)) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-  std::unique_ptr<cmFileListGeneratorBase> Clone() const override
-  {
-    std::unique_ptr<cmFileListGeneratorBase> g(
-      new cmFileListGeneratorCaseInsensitive(*this));
-    return g;
-  }
-};
-
-class cmFileListGeneratorGlob : public cmFileListGeneratorBase
-{
-public:
-  cmFileListGeneratorGlob(std::string str)
-    : Pattern(std::move(str))
-  {
-  }
-  cmFileListGeneratorGlob(cmFileListGeneratorGlob const& r)
-    : Pattern(r.Pattern)
-  {
-  }
-
-private:
-  std::string Pattern;
-  bool Search(std::string const& parent, cmFileList& lister) override
-  {
-    // Glob the set of matching files.
-    std::string expr = cmStrCat(parent, this->Pattern);
-    cmsys::Glob g;
-    if (!g.FindFiles(expr)) {
-      return false;
-    }
-    std::vector<std::string> const& files = g.GetFiles();
-
-    // Look for directories among the matches.
-    return std::any_of(files.cbegin(), files.cend(),
-                       [this, &lister](std::string const& f) {
-                         return this->Consider(f, lister);
-                       });
-  }
-  std::unique_ptr<cmFileListGeneratorBase> Clone() const override
-  {
-    return cm::make_unique<cmFileListGeneratorGlob>(*this);
-  }
-};
-} // anonymous namespace
-// END File paths generators
-
 bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
 {
   assert(!prefix_in.empty() && prefix_in.back() == '/');
@@ -2507,7 +2495,7 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
     return false;
   }
 
-  //  PREFIX/ (useful on windows or in build trees)
+  // PREFIX/ (useful on windows or in build trees)
   if (this->SearchDirectory(prefix_in)) {
     return true;
   }
@@ -2520,136 +2508,105 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
     return this->SearchDirectory(fullPath);
   };
 
-  //  PREFIX/(cmake|CMake)/ (useful on windows or in build trees)
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorCaseInsensitive("cmake");
-    if (lister.Search()) {
-      return true;
-    }
+  // PREFIX/(cmake|CMake)/ (useful on windows or in build trees)
+  if (TryGeneratedPaths(searchFn, prefix,
+                        cmFileListGeneratorCaseInsensitive{ "cmake"_s })) {
+    return true;
   }
 
-  //  PREFIX/(Foo|foo|FOO).*/
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorProject(this->Names, this->SortOrder,
-                                 this->SortDirection);
-    if (lister.Search()) {
-      return true;
-    }
+  // PREFIX/(Foo|foo|FOO).*/
+  if (TryGeneratedPaths(searchFn, prefix,
+                        cmFileListGeneratorProject{ this->Names,
+                                                    this->SortOrder,
+                                                    this->SortDirection })) {
+    return true;
   }
 
-  //  PREFIX/(Foo|foo|FOO).*/(cmake|CMake)/
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorProject(this->Names, this->SortOrder,
-                                 this->SortDirection) /
-      cmFileListGeneratorCaseInsensitive("cmake");
-    if (lister.Search()) {
-      return true;
-    }
+  // PREFIX/(Foo|foo|FOO).*/(cmake|CMake)/
+  if (TryGeneratedPaths(searchFn, prefix,
+                        cmFileListGeneratorProject{
+                          this->Names, this->SortOrder, this->SortDirection },
+                        cmFileListGeneratorCaseInsensitive{ "cmake"_s })) {
+    return true;
   }
 
   // Construct list of common install locations (lib and share).
-  std::vector<std::string> common;
+  std::vector<cm::string_view> common;
+  std::string libArch;
   if (!this->LibraryArchitecture.empty()) {
-    common.push_back("lib/" + this->LibraryArchitecture);
+    libArch = "lib/" + this->LibraryArchitecture;
+    common.emplace_back(libArch);
   }
   if (this->UseLib32Paths) {
-    common.emplace_back("lib32");
+    common.emplace_back("lib32"_s);
   }
   if (this->UseLib64Paths) {
-    common.emplace_back("lib64");
+    common.emplace_back("lib64"_s);
   }
   if (this->UseLibx32Paths) {
-    common.emplace_back("libx32");
+    common.emplace_back("libx32"_s);
   }
-  common.emplace_back("lib");
-  common.emplace_back("share");
+  common.emplace_back("lib"_s);
+  common.emplace_back("share"_s);
 
-  //  PREFIX/(lib/ARCH|lib*|share)/cmake/(Foo|foo|FOO).*/
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorEnumerate(common) /
-      cmFileListGeneratorFixed("cmake") /
-      cmFileListGeneratorProject(this->Names, this->SortOrder,
-                                 this->SortDirection);
-    if (lister.Search()) {
-      return true;
-    }
+  // PREFIX/(lib/ARCH|lib*|share)/cmake/(Foo|foo|FOO).*/
+  if (TryGeneratedPaths(
+        searchFn, prefix, cmEnumFixedStringsGenerator{ common },
+        cmFixedStringGenerator{ "cmake"_s },
+        cmFileListGeneratorProject{ this->Names, this->SortOrder,
+                                    this->SortDirection })) {
+    return true;
   }
 
-  //  PREFIX/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorEnumerate(common) /
-      cmFileListGeneratorProject(this->Names, this->SortOrder,
-                                 this->SortDirection);
-    if (lister.Search()) {
-      return true;
-    }
+  // PREFIX/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/
+  if (TryGeneratedPaths(
+        searchFn, prefix, cmEnumFixedStringsGenerator{ common },
+        cmFileListGeneratorProject{ this->Names, this->SortOrder,
+                                    this->SortDirection })) {
+    return true;
   }
 
-  //  PREFIX/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/(cmake|CMake)/
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorEnumerate(common) /
-      cmFileListGeneratorProject(this->Names, this->SortOrder,
-                                 this->SortDirection) /
-      cmFileListGeneratorCaseInsensitive("cmake");
-    if (lister.Search()) {
-      return true;
-    }
+  // PREFIX/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/(cmake|CMake)/
+  if (TryGeneratedPaths(searchFn, prefix,
+                        cmEnumFixedStringsGenerator{ common },
+                        cmFileListGeneratorProject{
+                          this->Names, this->SortOrder, this->SortDirection },
+                        cmFileListGeneratorCaseInsensitive{ "cmake"_s })) {
+    return true;
   }
 
   // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/cmake/(Foo|foo|FOO).*/
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorProject(this->Names, this->SortOrder,
-                                 this->SortDirection) /
-      cmFileListGeneratorEnumerate(common) /
-      cmFileListGeneratorFixed("cmake") /
-      cmFileListGeneratorProject(this->Names, this->SortOrder,
-                                 this->SortDirection);
-    if (lister.Search()) {
-      return true;
-    }
+  if (TryGeneratedPaths(
+        searchFn, prefix,
+        cmFileListGeneratorProject{ this->Names, this->SortOrder,
+                                    this->SortDirection },
+        cmEnumFixedStringsGenerator{ common },
+        cmFixedStringGenerator{ "cmake"_s },
+        cmFileListGeneratorProject{ this->Names, this->SortOrder,
+                                    this->SortDirection })) {
+    return true;
   }
 
   // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorProject(this->Names, this->SortOrder,
-                                 this->SortDirection) /
-      cmFileListGeneratorEnumerate(common) /
-      cmFileListGeneratorProject(this->Names, this->SortOrder,
-                                 this->SortDirection);
-    if (lister.Search()) {
-      return true;
-    }
+  if (TryGeneratedPaths(
+        searchFn, prefix,
+        cmFileListGeneratorProject{ this->Names, this->SortOrder,
+                                    this->SortDirection },
+        cmEnumFixedStringsGenerator{ common },
+        cmFileListGeneratorProject{ this->Names, this->SortOrder,
+                                    this->SortDirection })) {
+    return true;
   }
 
   // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/(cmake|CMake)/
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorProject(this->Names, this->SortOrder,
-                                 this->SortDirection) /
-      cmFileListGeneratorEnumerate(common) /
-      cmFileListGeneratorProject(this->Names, this->SortOrder,
-                                 this->SortDirection) /
-      cmFileListGeneratorCaseInsensitive("cmake");
-    if (lister.Search()) {
-      return true;
-    }
+  if (TryGeneratedPaths(searchFn, prefix,
+                        cmFileListGeneratorProject{
+                          this->Names, this->SortOrder, this->SortDirection },
+                        cmEnumFixedStringsGenerator{ common },
+                        cmFileListGeneratorProject{
+                          this->Names, this->SortOrder, this->SortDirection },
+                        cmFileListGeneratorCaseInsensitive{ "cmake"_s })) {
+    return true;
   }
 
   return false;
@@ -2668,50 +2625,39 @@ bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in)
   };
 
   // <prefix>/Foo.framework/Resources/
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorMacProject(this->Names, ".framework") /
-      cmFileListGeneratorFixed("Resources");
-    if (lister.Search()) {
-      return true;
-    }
+  if (TryGeneratedPaths(
+        searchFn, prefix,
+        cmFileListGeneratorMacProject{ this->Names, ".framework"_s },
+        cmFixedStringGenerator{ "Resources"_s })) {
+    return true;
   }
+
   // <prefix>/Foo.framework/Resources/CMake/
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorMacProject(this->Names, ".framework") /
-      cmFileListGeneratorFixed("Resources") /
-      cmFileListGeneratorCaseInsensitive("cmake");
-    if (lister.Search()) {
-      return true;
-    }
+  if (TryGeneratedPaths(
+        searchFn, prefix,
+        cmFileListGeneratorMacProject{ this->Names, ".framework"_s },
+        cmFixedStringGenerator{ "Resources"_s },
+        cmFileListGeneratorCaseInsensitive{ "cmake"_s })) {
+    return true;
   }
 
   // <prefix>/Foo.framework/Versions/*/Resources/
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorMacProject(this->Names, ".framework") /
-      cmFileListGeneratorFixed("Versions") /
-      cmFileListGeneratorGlob("*/Resources");
-    if (lister.Search()) {
-      return true;
-    }
+  if (TryGeneratedPaths(
+        searchFn, prefix,
+        cmFileListGeneratorMacProject{ this->Names, ".framework"_s },
+        cmFixedStringGenerator{ "Versions"_s },
+        cmFileListGeneratorGlob{ "/*/Resources"_s })) {
+    return true;
   }
 
   // <prefix>/Foo.framework/Versions/*/Resources/CMake/
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorMacProject(this->Names, ".framework") /
-      cmFileListGeneratorFixed("Versions") /
-      cmFileListGeneratorGlob("*/Resources") /
-      cmFileListGeneratorCaseInsensitive("cmake");
-    if (lister.Search()) {
-      return true;
-    }
+  if (TryGeneratedPaths(
+        searchFn, prefix,
+        cmFileListGeneratorMacProject{ this->Names, ".framework"_s },
+        cmFixedStringGenerator{ "Versions"_s },
+        cmFileListGeneratorGlob{ "/*/Resources"_s },
+        cmFileListGeneratorCaseInsensitive{ "cmake"_s })) {
+    return true;
   }
 
   return false;
@@ -2730,26 +2676,18 @@ bool cmFindPackageCommand::SearchAppBundlePrefix(std::string const& prefix_in)
   };
 
   // <prefix>/Foo.app/Contents/Resources
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorMacProject(this->Names, ".app") /
-      cmFileListGeneratorFixed("Contents/Resources");
-    if (lister.Search()) {
-      return true;
-    }
+  if (TryGeneratedPaths(searchFn, prefix,
+                        cmFileListGeneratorMacProject{ this->Names, ".app"_s },
+                        cmFixedStringGenerator{ "Contents/Resources"_s })) {
+    return true;
   }
 
   // <prefix>/Foo.app/Contents/Resources/CMake
-  {
-    cmFindPackageFileList lister(searchFn);
-    lister / cmFileListGeneratorFixed(prefix) /
-      cmFileListGeneratorMacProject(this->Names, ".app") /
-      cmFileListGeneratorFixed("Contents/Resources") /
-      cmFileListGeneratorCaseInsensitive("cmake");
-    if (lister.Search()) {
-      return true;
-    }
+  if (TryGeneratedPaths(searchFn, prefix,
+                        cmFileListGeneratorMacProject{ this->Names, ".app"_s },
+                        cmFixedStringGenerator{ "Contents/Resources"_s },
+                        cmFileListGeneratorCaseInsensitive{ "cmake"_s })) {
+    return true;
   }
 
   return false;
-- 
cgit v0.12


From fdd14b1744c13f500000440de11cc27557432766 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Tue, 5 Jul 2022 03:40:57 +0400
Subject: cmFindPackageCommand: Deduplicate directory listing code

The `cmFileListGeneratorProject` and `cmFileListGeneratorMacProject`
was look very similar 'cept few lines.

Now they have a base class and the generator-specific logic has moved
to overrides.
---
 Source/cmFindPackageCommand.cxx | 123 +++++++++++++++++++---------------------
 1 file changed, 58 insertions(+), 65 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index edea44e..7f6510b 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -204,56 +204,63 @@ private:
   bool Loaded = false;
 };
 
-class cmFileListGeneratorProject
+class cmDirectoryListGenerator
 {
 public:
-  cmFileListGeneratorProject(std::vector<std::string> const& names,
-                             cmFindPackageCommand::SortOrderType so,
-                             cmFindPackageCommand::SortDirectionType sd)
+  cmDirectoryListGenerator(std::vector<std::string> const& names)
     : Names{ names }
     , Matches{}
     , Current{ this->Matches.cbegin() }
-    , SortOrder{ so }
-    , SortDirection{ sd }
   {
   }
+  virtual ~cmDirectoryListGenerator() = default;
 
   std::string GetNextCandidate(const std::string& parent)
   {
     // Construct a list of matches if not yet
     if (this->Matches.empty()) {
       cmsys::Directory directoryLister;
+      // ALERT `Directory::Load()` keeps only names
+      // internally and LOST entry type from `dirent`.
+      // So, `Directory::FileIsDirectory` gonna use
+      // `SystemTools::FileIsDirectory()` and waste a syscall.
+      // TODO Need to enhance the `Directory` class.
       directoryLister.Load(parent);
+
+      // ATTENTION Is it guaranteed that first two entries are
+      // `.` and `..`?
+      // TODO If so, just start with index 2 and drop the
+      // `isDirentryToIgnore(i)` condition to check.
       for (auto i = 0ul; i < directoryLister.GetNumberOfFiles(); ++i) {
         const char* const fname = directoryLister.GetFile(i);
         if (isDirentryToIgnore(fname)) {
           continue;
         }
-        for (const auto& name : this->Names.get()) {
+
+        for (const auto& n : this->Names.get()) {
+          // NOTE Customization point for `cmFileListGeneratorMacProject`
+          const auto name = this->TransformNameBeforeCmp(n);
           // Skip entries that don't match and non-directories.
           // ATTENTION BTW, original code also didn't check if it's a symlink
-          // to a directory! ALERT `Directory::Load()` keep only names
-          // internally and LOST entry type So `Directory::FileIsDirectory`
-          // gonna use `SystemTools::FileIsDirectory()` (wasing a syscall)
-          // again!
-          if (cmsysString_strncasecmp(fname, name.c_str(), name.length()) ==
-                0 &&
-              directoryLister.FileIsDirectory(i)) {
+          // to a directory!
+          const auto equal =
+            (cmsysString_strncasecmp(fname, name.c_str(), name.length()) == 0);
+          if (equal && directoryLister.FileIsDirectory(i)) {
             this->Matches.emplace_back(fname);
           }
         }
       }
-      // check if there is a specific sorting order to perform
-      if (this->SortOrder != cmFindPackageCommand::None) {
-        cmFindPackageCommand::Sort(this->Matches.begin(), this->Matches.end(),
-                                   this->SortOrder, this->SortDirection);
-      }
+      // NOTE Customization point for `cmFileListGeneratorProject`
+      this->OnMatchesLoaded();
+
       this->Current = this->Matches.cbegin();
     }
+
     if (this->Current != this->Matches.cend()) {
       auto candidate = cmStrCat(parent, '/', *this->Current++);
       return candidate;
     }
+
     return {};
   }
 
@@ -263,73 +270,59 @@ public:
     this->Current = this->Matches.cbegin();
   }
 
-private:
+protected:
+  virtual void OnMatchesLoaded() {}
+  virtual std::string TransformNameBeforeCmp(std::string same) { return same; }
+
   std::reference_wrapper<const std::vector<std::string>> Names;
   std::vector<std::string> Matches;
   std::vector<std::string>::const_iterator Current;
+};
+
+class cmFileListGeneratorProject : public cmDirectoryListGenerator
+{
+public:
+  cmFileListGeneratorProject(std::vector<std::string> const& names,
+                             cmFindPackageCommand::SortOrderType so,
+                             cmFindPackageCommand::SortDirectionType sd)
+    : cmDirectoryListGenerator{ names }
+    , SortOrder{ so }
+    , SortDirection{ sd }
+  {
+  }
+
+  void OnMatchesLoaded() override
+  {
+    // check if there is a specific sorting order to perform
+    if (this->SortOrder != cmFindPackageCommand::None) {
+      cmFindPackageCommand::Sort(this->Matches.begin(), this->Matches.end(),
+                                 this->SortOrder, this->SortDirection);
+    }
+  }
+
+private:
   // sort parameters
   const cmFindPackageCommand::SortOrderType SortOrder;
   const cmFindPackageCommand::SortDirectionType SortDirection;
 };
 
-class cmFileListGeneratorMacProject
+class cmFileListGeneratorMacProject : public cmDirectoryListGenerator
 {
 public:
   cmFileListGeneratorMacProject(const std::vector<std::string>& names,
                                 cm::string_view ext)
-    : Names{ names }
+    : cmDirectoryListGenerator{ names }
     , Extension{ ext }
-    , Matches{}
-    , Current{ this->Matches.cbegin() }
   {
   }
 
-  std::string GetNextCandidate(const std::string& parent)
-  {
-    // Construct a list of matches if not yet
-    if (this->Matches.empty()) {
-      cmsys::Directory directoryLister;
-      directoryLister.Load(parent);
-      for (auto i = 0ul; i < directoryLister.GetNumberOfFiles(); ++i) {
-        const char* const fname = directoryLister.GetFile(i);
-        if (isDirentryToIgnore(fname)) {
-          continue;
-        }
-        for (auto name : this->Names.get()) {
-          name += this->Extension;
-          // Skip entries that don't match and non-directories.
-          // ATTENTION BTW, original code also didn't check if it's a symlink
-          // to a directory! ALERT `Directory::Load()` keep only names
-          // internally and LOST entry type So `Directory::FileIsDirectory`
-          // gonna use `SystemTools::FileIsDirectory()` (wasing a syscall)
-          // again!
-          if (cmsysString_strncasecmp(fname, name.c_str(), name.length()) ==
-                0 &&
-              directoryLister.FileIsDirectory(i)) {
-            this->Matches.emplace_back(fname);
-          }
-        }
-      }
-      this->Current = this->Matches.cbegin();
-    }
-    if (this->Current != this->Matches.cend()) {
-      auto candidate = cmStrCat(parent, '/', *this->Current++);
-      return candidate;
-    }
-    return {};
-  }
-
-  void Reset()
+  std::string TransformNameBeforeCmp(std::string name) override
   {
-    this->Matches.clear();
-    this->Current = this->Matches.cbegin();
+    return cmStrCat(name, this->Extension);
   }
 
 private:
-  std::reference_wrapper<const std::vector<std::string>> Names;
   const cm::string_view Extension;
-  std::vector<std::string> Matches;
-  std::vector<std::string>::const_iterator Current;
 };
 
 class cmFileListGeneratorGlob
-- 
cgit v0.12


From c862797a40f851284053985596650322356e1326 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Tue, 5 Jul 2022 03:47:13 +0400
Subject: cmFindPackageCommand: Rename some generators

The point is that `cmFileListBlahBlahGenerator` actually "generate"
directory names and never files.

The `cmBlahBlahStringGenerators` produce paths in fact. Ok, paths
nowadays are also strings but...
---
 Source/cmFindPackageCommand.cxx | 149 +++++++++++++++++++++-------------------
 1 file changed, 77 insertions(+), 72 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 7f6510b..7450edf 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -112,10 +112,10 @@ bool isDirentryToIgnore(const char* const fname)
     (fname[1] == 0 || (fname[1] == '.' && fname[2] == 0));
 }
 
-class cmFixedStringGenerator
+class cmAppendPathSegmentGenerator
 {
 public:
-  cmFixedStringGenerator(cm::string_view dirName)
+  cmAppendPathSegmentGenerator(cm::string_view dirName)
     : DirName{ dirName }
   {
   }
@@ -136,10 +136,10 @@ private:
   bool NeedReset = false;
 };
 
-class cmEnumFixedStringsGenerator
+class cmEnumPathSegmentsGenerator
 {
 public:
-  cmEnumFixedStringsGenerator(const std::vector<cm::string_view>& init)
+  cmEnumPathSegmentsGenerator(const std::vector<cm::string_view>& init)
     : Names{ init }
     , Current{ this->Names.get().cbegin() }
   {
@@ -160,10 +160,10 @@ private:
   std::vector<cm::string_view>::const_iterator Current;
 };
 
-class cmFileListGeneratorCaseInsensitive
+class cmCaseInsensitiveDirectoryListGenerator
 {
 public:
-  cmFileListGeneratorCaseInsensitive(cm::string_view name)
+  cmCaseInsensitiveDirectoryListGenerator(cm::string_view name)
     : DirectoryLister{}
     , DirName{ name }
   {
@@ -238,7 +238,7 @@ public:
         }
 
         for (const auto& n : this->Names.get()) {
-          // NOTE Customization point for `cmFileListGeneratorMacProject`
+          // NOTE Customization point for `cmMacProjectDirectoryListGenerator`
           const auto name = this->TransformNameBeforeCmp(n);
           // Skip entries that don't match and non-directories.
           // ATTENTION BTW, original code also didn't check if it's a symlink
@@ -250,7 +250,7 @@ public:
           }
         }
       }
-      // NOTE Customization point for `cmFileListGeneratorProject`
+      // NOTE Customization point for `cmProjectDirectoryListGenerator`
       this->OnMatchesLoaded();
 
       this->Current = this->Matches.cbegin();
@@ -279,12 +279,12 @@ protected:
   std::vector<std::string>::const_iterator Current;
 };
 
-class cmFileListGeneratorProject : public cmDirectoryListGenerator
+class cmProjectDirectoryListGenerator : public cmDirectoryListGenerator
 {
 public:
-  cmFileListGeneratorProject(std::vector<std::string> const& names,
-                             cmFindPackageCommand::SortOrderType so,
-                             cmFindPackageCommand::SortDirectionType sd)
+  cmProjectDirectoryListGenerator(std::vector<std::string> const& names,
+                                  cmFindPackageCommand::SortOrderType so,
+                                  cmFindPackageCommand::SortDirectionType sd)
     : cmDirectoryListGenerator{ names }
     , SortOrder{ so }
     , SortDirection{ sd }
@@ -306,11 +306,11 @@ private:
   const cmFindPackageCommand::SortDirectionType SortDirection;
 };
 
-class cmFileListGeneratorMacProject : public cmDirectoryListGenerator
+class cmMacProjectDirectoryListGenerator : public cmDirectoryListGenerator
 {
 public:
-  cmFileListGeneratorMacProject(const std::vector<std::string>& names,
-                                cm::string_view ext)
+  cmMacProjectDirectoryListGenerator(const std::vector<std::string>& names,
+                                     cm::string_view ext)
     : cmDirectoryListGenerator{ names }
     , Extension{ ext }
   {
@@ -2502,24 +2502,26 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
   };
 
   // PREFIX/(cmake|CMake)/ (useful on windows or in build trees)
-  if (TryGeneratedPaths(searchFn, prefix,
-                        cmFileListGeneratorCaseInsensitive{ "cmake"_s })) {
+  if (TryGeneratedPaths(
+        searchFn, prefix,
+        cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) {
     return true;
   }
 
   // PREFIX/(Foo|foo|FOO).*/
-  if (TryGeneratedPaths(searchFn, prefix,
-                        cmFileListGeneratorProject{ this->Names,
-                                                    this->SortOrder,
-                                                    this->SortDirection })) {
+  if (TryGeneratedPaths(
+        searchFn, prefix,
+        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
+                                         this->SortDirection })) {
     return true;
   }
 
   // PREFIX/(Foo|foo|FOO).*/(cmake|CMake)/
-  if (TryGeneratedPaths(searchFn, prefix,
-                        cmFileListGeneratorProject{
-                          this->Names, this->SortOrder, this->SortDirection },
-                        cmFileListGeneratorCaseInsensitive{ "cmake"_s })) {
+  if (TryGeneratedPaths(
+        searchFn, prefix,
+        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
+                                         this->SortDirection },
+        cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) {
     return true;
   }
 
@@ -2544,61 +2546,62 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
 
   // PREFIX/(lib/ARCH|lib*|share)/cmake/(Foo|foo|FOO).*/
   if (TryGeneratedPaths(
-        searchFn, prefix, cmEnumFixedStringsGenerator{ common },
-        cmFixedStringGenerator{ "cmake"_s },
-        cmFileListGeneratorProject{ this->Names, this->SortOrder,
-                                    this->SortDirection })) {
+        searchFn, prefix, cmEnumPathSegmentsGenerator{ common },
+        cmAppendPathSegmentGenerator{ "cmake"_s },
+        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
+                                         this->SortDirection })) {
     return true;
   }
 
   // PREFIX/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/
   if (TryGeneratedPaths(
-        searchFn, prefix, cmEnumFixedStringsGenerator{ common },
-        cmFileListGeneratorProject{ this->Names, this->SortOrder,
-                                    this->SortDirection })) {
+        searchFn, prefix, cmEnumPathSegmentsGenerator{ common },
+        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
+                                         this->SortDirection })) {
     return true;
   }
 
   // PREFIX/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/(cmake|CMake)/
-  if (TryGeneratedPaths(searchFn, prefix,
-                        cmEnumFixedStringsGenerator{ common },
-                        cmFileListGeneratorProject{
-                          this->Names, this->SortOrder, this->SortDirection },
-                        cmFileListGeneratorCaseInsensitive{ "cmake"_s })) {
+  if (TryGeneratedPaths(
+        searchFn, prefix, cmEnumPathSegmentsGenerator{ common },
+        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
+                                         this->SortDirection },
+        cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) {
     return true;
   }
 
   // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/cmake/(Foo|foo|FOO).*/
   if (TryGeneratedPaths(
         searchFn, prefix,
-        cmFileListGeneratorProject{ this->Names, this->SortOrder,
-                                    this->SortDirection },
-        cmEnumFixedStringsGenerator{ common },
-        cmFixedStringGenerator{ "cmake"_s },
-        cmFileListGeneratorProject{ this->Names, this->SortOrder,
-                                    this->SortDirection })) {
+        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
+                                         this->SortDirection },
+        cmEnumPathSegmentsGenerator{ common },
+        cmAppendPathSegmentGenerator{ "cmake"_s },
+        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
+                                         this->SortDirection })) {
     return true;
   }
 
   // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/
   if (TryGeneratedPaths(
         searchFn, prefix,
-        cmFileListGeneratorProject{ this->Names, this->SortOrder,
-                                    this->SortDirection },
-        cmEnumFixedStringsGenerator{ common },
-        cmFileListGeneratorProject{ this->Names, this->SortOrder,
-                                    this->SortDirection })) {
+        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
+                                         this->SortDirection },
+        cmEnumPathSegmentsGenerator{ common },
+        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
+                                         this->SortDirection })) {
     return true;
   }
 
   // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/(cmake|CMake)/
-  if (TryGeneratedPaths(searchFn, prefix,
-                        cmFileListGeneratorProject{
-                          this->Names, this->SortOrder, this->SortDirection },
-                        cmEnumFixedStringsGenerator{ common },
-                        cmFileListGeneratorProject{
-                          this->Names, this->SortOrder, this->SortDirection },
-                        cmFileListGeneratorCaseInsensitive{ "cmake"_s })) {
+  if (TryGeneratedPaths(
+        searchFn, prefix,
+        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
+                                         this->SortDirection },
+        cmEnumPathSegmentsGenerator{ common },
+        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
+                                         this->SortDirection },
+        cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) {
     return true;
   }
 
@@ -2620,25 +2623,25 @@ bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in)
   // <prefix>/Foo.framework/Resources/
   if (TryGeneratedPaths(
         searchFn, prefix,
-        cmFileListGeneratorMacProject{ this->Names, ".framework"_s },
-        cmFixedStringGenerator{ "Resources"_s })) {
+        cmMacProjectDirectoryListGenerator{ this->Names, ".framework"_s },
+        cmAppendPathSegmentGenerator{ "Resources"_s })) {
     return true;
   }
 
   // <prefix>/Foo.framework/Resources/CMake/
   if (TryGeneratedPaths(
         searchFn, prefix,
-        cmFileListGeneratorMacProject{ this->Names, ".framework"_s },
-        cmFixedStringGenerator{ "Resources"_s },
-        cmFileListGeneratorCaseInsensitive{ "cmake"_s })) {
+        cmMacProjectDirectoryListGenerator{ this->Names, ".framework"_s },
+        cmAppendPathSegmentGenerator{ "Resources"_s },
+        cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) {
     return true;
   }
 
   // <prefix>/Foo.framework/Versions/*/Resources/
   if (TryGeneratedPaths(
         searchFn, prefix,
-        cmFileListGeneratorMacProject{ this->Names, ".framework"_s },
-        cmFixedStringGenerator{ "Versions"_s },
+        cmMacProjectDirectoryListGenerator{ this->Names, ".framework"_s },
+        cmAppendPathSegmentGenerator{ "Versions"_s },
         cmFileListGeneratorGlob{ "/*/Resources"_s })) {
     return true;
   }
@@ -2646,10 +2649,10 @@ bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in)
   // <prefix>/Foo.framework/Versions/*/Resources/CMake/
   if (TryGeneratedPaths(
         searchFn, prefix,
-        cmFileListGeneratorMacProject{ this->Names, ".framework"_s },
-        cmFixedStringGenerator{ "Versions"_s },
+        cmMacProjectDirectoryListGenerator{ this->Names, ".framework"_s },
+        cmAppendPathSegmentGenerator{ "Versions"_s },
         cmFileListGeneratorGlob{ "/*/Resources"_s },
-        cmFileListGeneratorCaseInsensitive{ "cmake"_s })) {
+        cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) {
     return true;
   }
 
@@ -2669,17 +2672,19 @@ bool cmFindPackageCommand::SearchAppBundlePrefix(std::string const& prefix_in)
   };
 
   // <prefix>/Foo.app/Contents/Resources
-  if (TryGeneratedPaths(searchFn, prefix,
-                        cmFileListGeneratorMacProject{ this->Names, ".app"_s },
-                        cmFixedStringGenerator{ "Contents/Resources"_s })) {
+  if (TryGeneratedPaths(
+        searchFn, prefix,
+        cmMacProjectDirectoryListGenerator{ this->Names, ".app"_s },
+        cmAppendPathSegmentGenerator{ "Contents/Resources"_s })) {
     return true;
   }
 
   // <prefix>/Foo.app/Contents/Resources/CMake
-  if (TryGeneratedPaths(searchFn, prefix,
-                        cmFileListGeneratorMacProject{ this->Names, ".app"_s },
-                        cmFixedStringGenerator{ "Contents/Resources"_s },
-                        cmFileListGeneratorCaseInsensitive{ "cmake"_s })) {
+  if (TryGeneratedPaths(
+        searchFn, prefix,
+        cmMacProjectDirectoryListGenerator{ this->Names, ".app"_s },
+        cmAppendPathSegmentGenerator{ "Contents/Resources"_s },
+        cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) {
     return true;
   }
 
-- 
cgit v0.12


From 664abd486f5db0000c44c274ec6af10f4f079a44 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Tue, 5 Jul 2022 04:39:10 +0400
Subject: cmFindPackageCommand: Better names for template parameters

---
 Source/cmFindPackageCommand.cxx | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 7450edf..ef7c49c 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -381,34 +381,37 @@ void ResetGenerator()
 {
 }
 
-template <typename T>
-void ResetGenerator(T&& g)
+template <typename Generator>
+void ResetGenerator(Generator&& generator)
 {
-  std::forward<T&&>(g).Reset();
+  std::forward<Generator&&>(generator).Reset();
 }
 
-template <typename T, typename... Ts>
-void ResetGenerator(T&& g, Ts&&... tail)
+template <typename Generator, typename... Generators>
+void ResetGenerator(Generator&& generator, Generators&&... generators)
 {
-  ResetGenerator(std::forward<T&&>(g));
-  ResetGenerator(std::forward<Ts&&>(tail)...);
+  ResetGenerator(std::forward<Generator&&>(generator));
+  ResetGenerator(std::forward<Generators&&>(generators)...);
 }
 
-template <typename Fn>
-bool TryGeneratedPaths(Fn&& checker, const std::string& fullPath)
+template <typename CallbackFn>
+bool TryGeneratedPaths(CallbackFn&& filesCollector,
+                       const std::string& fullPath)
 {
   assert(!fullPath.empty() && fullPath.back() != '/');
-  return std::forward<Fn&&>(checker)(fullPath + '/');
+  return std::forward<CallbackFn&&>(filesCollector)(fullPath + '/');
 }
 
-template <typename Fn, typename Generator, typename... Rest>
-bool TryGeneratedPaths(Fn&& checker, const std::string& startPath,
-                       Generator&& gen, Rest&&... tail)
+template <typename CallbackFn, typename Generator, typename... Rest>
+bool TryGeneratedPaths(CallbackFn&& filesCollector,
+                       const std::string& startPath, Generator&& gen,
+                       Rest&&... tail)
 {
+  ResetGenerator(std::forward<Generator&&>(gen));
   for (auto path = gen.GetNextCandidate(startPath); !path.empty();
        path = gen.GetNextCandidate(startPath)) {
     ResetGenerator(std::forward<Rest&&>(tail)...);
-    if (TryGeneratedPaths(std::forward<Fn&&>(checker), path,
+    if (TryGeneratedPaths(std::forward<CallbackFn&&>(filesCollector), path,
                           std::forward<Rest&&>(tail)...)) {
       return true;
     }
-- 
cgit v0.12


From 076a4b44b0b338eac767c9c96895afdaf7321486 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
Date: Tue, 5 Jul 2022 04:39:33 +0400
Subject: cmFindPackageCommand: Path generators are actually reusable

---
 Source/cmFindPackageCommand.cxx | 116 ++++++++++++++--------------------------
 1 file changed, 40 insertions(+), 76 deletions(-)

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index ef7c49c..f10b097 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -2504,27 +2504,23 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
     return this->SearchDirectory(fullPath);
   };
 
+  auto iCMakeGen = cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s };
+  auto firstPkgDirGen =
+    cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
+                                     this->SortDirection };
+
   // PREFIX/(cmake|CMake)/ (useful on windows or in build trees)
-  if (TryGeneratedPaths(
-        searchFn, prefix,
-        cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) {
+  if (TryGeneratedPaths(searchFn, prefix, iCMakeGen)) {
     return true;
   }
 
   // PREFIX/(Foo|foo|FOO).*/
-  if (TryGeneratedPaths(
-        searchFn, prefix,
-        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
-                                         this->SortDirection })) {
+  if (TryGeneratedPaths(searchFn, prefix, firstPkgDirGen)) {
     return true;
   }
 
   // PREFIX/(Foo|foo|FOO).*/(cmake|CMake)/
-  if (TryGeneratedPaths(
-        searchFn, prefix,
-        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
-                                         this->SortDirection },
-        cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) {
+  if (TryGeneratedPaths(searchFn, prefix, firstPkgDirGen, iCMakeGen)) {
     return true;
   }
 
@@ -2547,64 +2543,43 @@ bool cmFindPackageCommand::SearchPrefix(std::string const& prefix_in)
   common.emplace_back("lib"_s);
   common.emplace_back("share"_s);
 
+  auto cmnGen = cmEnumPathSegmentsGenerator{ common };
+  auto cmakeGen = cmAppendPathSegmentGenerator{ "cmake"_s };
+
   // PREFIX/(lib/ARCH|lib*|share)/cmake/(Foo|foo|FOO).*/
-  if (TryGeneratedPaths(
-        searchFn, prefix, cmEnumPathSegmentsGenerator{ common },
-        cmAppendPathSegmentGenerator{ "cmake"_s },
-        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
-                                         this->SortDirection })) {
+  if (TryGeneratedPaths(searchFn, prefix, cmnGen, cmakeGen, firstPkgDirGen)) {
     return true;
   }
 
   // PREFIX/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/
-  if (TryGeneratedPaths(
-        searchFn, prefix, cmEnumPathSegmentsGenerator{ common },
-        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
-                                         this->SortDirection })) {
+  if (TryGeneratedPaths(searchFn, prefix, cmnGen, firstPkgDirGen)) {
     return true;
   }
 
   // PREFIX/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/(cmake|CMake)/
-  if (TryGeneratedPaths(
-        searchFn, prefix, cmEnumPathSegmentsGenerator{ common },
-        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
-                                         this->SortDirection },
-        cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) {
+  if (TryGeneratedPaths(searchFn, prefix, cmnGen, firstPkgDirGen, iCMakeGen)) {
     return true;
   }
 
+  auto secondPkgDirGen =
+    cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
+                                     this->SortDirection };
+
   // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/cmake/(Foo|foo|FOO).*/
-  if (TryGeneratedPaths(
-        searchFn, prefix,
-        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
-                                         this->SortDirection },
-        cmEnumPathSegmentsGenerator{ common },
-        cmAppendPathSegmentGenerator{ "cmake"_s },
-        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
-                                         this->SortDirection })) {
+  if (TryGeneratedPaths(searchFn, prefix, firstPkgDirGen, cmnGen, cmakeGen,
+                        secondPkgDirGen)) {
     return true;
   }
 
   // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/
-  if (TryGeneratedPaths(
-        searchFn, prefix,
-        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
-                                         this->SortDirection },
-        cmEnumPathSegmentsGenerator{ common },
-        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
-                                         this->SortDirection })) {
+  if (TryGeneratedPaths(searchFn, prefix, firstPkgDirGen, cmnGen,
+                        secondPkgDirGen)) {
     return true;
   }
 
   // PREFIX/(Foo|foo|FOO).*/(lib/ARCH|lib*|share)/(Foo|foo|FOO).*/(cmake|CMake)/
-  if (TryGeneratedPaths(
-        searchFn, prefix,
-        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
-                                         this->SortDirection },
-        cmEnumPathSegmentsGenerator{ common },
-        cmProjectDirectoryListGenerator{ this->Names, this->SortOrder,
-                                         this->SortDirection },
-        cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) {
+  if (TryGeneratedPaths(searchFn, prefix, firstPkgDirGen, cmnGen,
+                        secondPkgDirGen, iCMakeGen)) {
     return true;
   }
 
@@ -2623,39 +2598,30 @@ bool cmFindPackageCommand::SearchFrameworkPrefix(std::string const& prefix_in)
     return this->SearchDirectory(fullPath);
   };
 
+  auto iCMakeGen = cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s };
+  auto fwGen =
+    cmMacProjectDirectoryListGenerator{ this->Names, ".framework"_s };
+  auto rGen = cmAppendPathSegmentGenerator{ "Resources"_s };
+  auto vGen = cmAppendPathSegmentGenerator{ "Versions"_s };
+  auto grGen = cmFileListGeneratorGlob{ "/*/Resources"_s };
+
   // <prefix>/Foo.framework/Resources/
-  if (TryGeneratedPaths(
-        searchFn, prefix,
-        cmMacProjectDirectoryListGenerator{ this->Names, ".framework"_s },
-        cmAppendPathSegmentGenerator{ "Resources"_s })) {
+  if (TryGeneratedPaths(searchFn, prefix, fwGen, rGen)) {
     return true;
   }
 
   // <prefix>/Foo.framework/Resources/CMake/
-  if (TryGeneratedPaths(
-        searchFn, prefix,
-        cmMacProjectDirectoryListGenerator{ this->Names, ".framework"_s },
-        cmAppendPathSegmentGenerator{ "Resources"_s },
-        cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) {
+  if (TryGeneratedPaths(searchFn, prefix, fwGen, rGen, iCMakeGen)) {
     return true;
   }
 
   // <prefix>/Foo.framework/Versions/*/Resources/
-  if (TryGeneratedPaths(
-        searchFn, prefix,
-        cmMacProjectDirectoryListGenerator{ this->Names, ".framework"_s },
-        cmAppendPathSegmentGenerator{ "Versions"_s },
-        cmFileListGeneratorGlob{ "/*/Resources"_s })) {
+  if (TryGeneratedPaths(searchFn, prefix, fwGen, vGen, grGen)) {
     return true;
   }
 
   // <prefix>/Foo.framework/Versions/*/Resources/CMake/
-  if (TryGeneratedPaths(
-        searchFn, prefix,
-        cmMacProjectDirectoryListGenerator{ this->Names, ".framework"_s },
-        cmAppendPathSegmentGenerator{ "Versions"_s },
-        cmFileListGeneratorGlob{ "/*/Resources"_s },
-        cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) {
+  if (TryGeneratedPaths(searchFn, prefix, fwGen, vGen, grGen, iCMakeGen)) {
     return true;
   }
 
@@ -2674,19 +2640,17 @@ bool cmFindPackageCommand::SearchAppBundlePrefix(std::string const& prefix_in)
     return this->SearchDirectory(fullPath);
   };
 
+  auto appGen = cmMacProjectDirectoryListGenerator{ this->Names, ".app"_s };
+  auto crGen = cmAppendPathSegmentGenerator{ "Contents/Resources"_s };
+
   // <prefix>/Foo.app/Contents/Resources
-  if (TryGeneratedPaths(
-        searchFn, prefix,
-        cmMacProjectDirectoryListGenerator{ this->Names, ".app"_s },
-        cmAppendPathSegmentGenerator{ "Contents/Resources"_s })) {
+  if (TryGeneratedPaths(searchFn, prefix, appGen, crGen)) {
     return true;
   }
 
   // <prefix>/Foo.app/Contents/Resources/CMake
   if (TryGeneratedPaths(
-        searchFn, prefix,
-        cmMacProjectDirectoryListGenerator{ this->Names, ".app"_s },
-        cmAppendPathSegmentGenerator{ "Contents/Resources"_s },
+        searchFn, prefix, appGen, crGen,
         cmCaseInsensitiveDirectoryListGenerator{ "cmake"_s })) {
     return true;
   }
-- 
cgit v0.12


From 2f69c0233cec7dc64053813c20cc83d306247594 Mon Sep 17 00:00:00 2001
From: Alex Turbov <i.zaufi@gmail.com>
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)
   }
 
   // <prefix>/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)
   }
 
   // <prefix>/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