From 9af6db11b6889f1968a6930a2bff82b02f296191 Mon Sep 17 00:00:00 2001
From: jhendersonHDF <jhenderson@hdfgroup.org>
Date: Thu, 22 Jan 2026 16:14:20 -0600
Subject: [PATCH] Distribute Findlibaec.cmake module for use by HDF5 library
 consumers (#6159)

---
 CMakeInstallation.cmake             | 9 +++++++++
 config/install/hdf5-config.cmake.in | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index 0313580bbf0..861e9c207c7 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -150,6 +150,15 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED)
   )
 endif ()
 
+#-----------------------------------------------------------------------------
+# Add CMake Find modules to installation
+#-----------------------------------------------------------------------------
+install (
+    FILES ${CMAKE_SOURCE_DIR}/config/cmake/Findlibaec.cmake
+    DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/Modules
+    COMPONENT configinstall
+)
+
 #-----------------------------------------------------------------------------
 # Configure the libhdf5.settings file with library info
 #-----------------------------------------------------------------------------
diff --git a/config/install/hdf5-config.cmake.in b/config/install/hdf5-config.cmake.in
index 6a59592ad59..3c8374b3f7f 100644
--- a/config/install/hdf5-config.cmake.in
+++ b/config/install/hdf5-config.cmake.in
@@ -18,6 +18,8 @@
 
 include(CMakeFindDependencyMacro)
 
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/Modules")
+
 string(TOUPPER @HDF5_PACKAGE@ HDF5_PACKAGE_NAME)
 
 set (${HDF5_PACKAGE_NAME}_VALID_COMPONENTS
@@ -135,7 +137,7 @@ endif ()
 
 if (${HDF5_PACKAGE_NAME}_PROVIDES_SZIP_SUPPORT)
   if (NOT @SZIP_USE_EXTERNAL@)
-    find_dependency (LIBAEC NAMES @LIBAEC_PACKAGE_NAME@ CONFIG OPTIONAL_COMPONENTS @LIBAEC_SEARCH_TYPE@)
+    find_dependency (@LIBAEC_PACKAGE_NAME@ OPTIONAL_COMPONENTS @LIBAEC_SEARCH_TYPE@)
   endif ()
 endif ()