Simplify overriding upstream find modules

Author: petk

cmake/cmake/modules/FindICU.cmake

@@ -37,13 +37,9 @@ if(PKG_CONFIG_FOUND)
   endif()
 endif()
 
-# Find package with upstream CMake module; override CMAKE_MODULE_PATH to prevent
-# the maximum nesting/recursion depth error on some systems, like macOS.
-set(_php_cmake_module_path ${CMAKE_MODULE_PATH})
-unset(CMAKE_MODULE_PATH)
-include(FindICU)
-set(CMAKE_MODULE_PATH ${_php_cmake_module_path})
-unset(_php_cmake_module_path)
+# Find package with upstream CMake find module. Absolute path prevents the
+# maximum nesting/recursion depth error on some systems, like macOS.
+include(${CMAKE_ROOT}/Modules/FindICU.cmake)
 
 # Upstream CMake module doesn't mark these as advanced variables.
 # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9199

cmake/cmake/modules/FindIconv.cmake

@@ -49,10 +49,6 @@ if(CMAKE_PREFIX_PATH OR Iconv_ROOT OR ICONV_ROOT)
   endif()
 endif()
 
-# Find package with upstream CMake module; override CMAKE_MODULE_PATH to prevent
-# the maximum nesting/recursion depth error on some systems, like macOS.
-set(_php_cmake_module_path ${CMAKE_MODULE_PATH})
-unset(CMAKE_MODULE_PATH)
-include(FindIconv)
-set(CMAKE_MODULE_PATH ${_php_cmake_module_path})
-unset(_php_cmake_module_path)
+# Find package with upstream CMake find module. Absolute path prevents the
+# maximum nesting/recursion depth error on some systems, like macOS.
+include(${CMAKE_ROOT}/Modules/FindIconv.cmake)

cmake/cmake/modules/FindIntl.cmake

@@ -38,10 +38,6 @@ if(CMAKE_PREFIX_PATH OR Intl_ROOT OR INTL_ROOT)
   endif()
 endif()
 
-# Find package with upstream CMake module; override CMAKE_MODULE_PATH to prevent
-# the maximum nesting/recursion depth error on some systems, like macOS.
-set(_php_cmake_module_path ${CMAKE_MODULE_PATH})
-unset(CMAKE_MODULE_PATH)
-include(FindIntl)
-set(CMAKE_MODULE_PATH ${_php_cmake_module_path})
-unset(_php_cmake_module_path)
+# Find package with upstream CMake find module. Absolute path prevents the
+# maximum nesting/recursion depth error on some systems, like macOS.
+include(${CMAKE_ROOT}/Modules/FindIntl.cmake)

cmake/cmake/modules/FindLibXslt.cmake

@@ -21,13 +21,9 @@ set_package_properties(
     DESCRIPTION "XSLT processor library"
 )
 
-# Find package with upstream CMake module; override CMAKE_MODULE_PATH to prevent
-# the maximum nesting/recursion depth error on some systems, like macOS.
-set(_php_cmake_module_path ${CMAKE_MODULE_PATH})
-unset(CMAKE_MODULE_PATH)
-include(FindLibXslt)
-set(CMAKE_MODULE_PATH ${_php_cmake_module_path})
-unset(_php_cmake_module_path)
+# Find package with upstream CMake find module. Absolute path prevents the
+# maximum nesting/recursion depth error on some systems, like macOS.
+include(${CMAKE_ROOT}/Modules/FindLibXslt.cmake)
 
 # Upstream CMake module doesn't mark these as advanced variables.
 # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8807