From fbb9ad25963c5ca8c2f7827c30e9543df5528778 Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Mon, 11 Sep 2023 07:45:36 -0500
Subject: Fix windows cpack with debug (#3525)

---
 CMakeInstallation.cmake   |  4 +++-
 config/cmake/patch.xml    | 11 -----------
 config/cmake/patch.xml.in | 11 +++++++++++
 3 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 config/cmake/patch.xml
 create mode 100644 config/cmake/patch.xml.in

diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index c7b6a1f..070f26f 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -394,7 +394,9 @@ if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
     set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "${HDF5_PACKAGE_URL}")
     set(CPACK_WIX_PROPERTY_ARPHELPLINK "${HDF5_PACKAGE_BUGREPORT}")
     if (BUILD_SHARED_LIBS)
-      set(CPACK_WIX_PATCH_FILE "${HDF_RESOURCES_DIR}/patch.xml")
+      set (WIX_CMP_NAME "${HDF5_LIB_NAME}${CMAKE_DEBUG_POSTFIX}")
+      configure_file (${HDF_RESOURCES_DIR}/patch.xml.in ${HDF5_BINARY_DIR}/patch.xml @ONLY)
+      set(CPACK_WIX_PATCH_FILE "${HDF5_BINARY_DIR}/patch.xml")
     endif ()
   elseif (APPLE)
     list (APPEND CPACK_GENERATOR "STGZ")
diff --git a/config/cmake/patch.xml b/config/cmake/patch.xml
deleted file mode 100644
index 1bdff3e..0000000
--- a/config/cmake/patch.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<CPackWiXPatch>
-    <CPackWiXFragment Id="CM_CP_libraries.bin.hdf5.dll">
-        <Environment Id="PATH" 
-             Name="PATH" 
-             Value="[CM_DP_libraries.bin]" 
-             Permanent="no" 
-             Part="last" 
-             Action="set" 
-             System="yes"/>
-    </CPackWiXFragment>
-</CPackWiXPatch>
diff --git a/config/cmake/patch.xml.in b/config/cmake/patch.xml.in
new file mode 100644
index 0000000..d6843e1
--- /dev/null
+++ b/config/cmake/patch.xml.in
@@ -0,0 +1,11 @@
+<CPackWiXPatch>
+    <CPackWiXFragment Id="CM_CP_libraries.bin.@WIX_CMP_NAME@.dll">
+        <Environment Id="PATH" 
+             Name="PATH" 
+             Value="[CM_DP_libraries.bin]" 
+             Permanent="no" 
+             Part="last" 
+             Action="set" 
+             System="yes"/>
+    </CPackWiXFragment>
+</CPackWiXPatch>
-- 
cgit v0.12