Fix windows cpack with debug

HDFGroup · Sep 10, 2023 · b329e54 · b329e54
1 parent 117d579
commit b329e54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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 → config/cmake/patch.xml.in b/config/cmake/patch.xml → config/cmake/patch.xml.in
@@ -1,5 +1,5 @@
 <CPackWiXPatch>
-    <CPackWiXFragment Id="CM_CP_libraries.bin.hdf5.dll">
+    <CPackWiXFragment Id="CM_CP_libraries.bin.@WIX_CMP_NAME@.dll">
         <Environment Id="PATH" 
              Name="PATH" 
              Value="[CM_DP_libraries.bin]"