From b329e54a63854c8935139507018d025058611fd8 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Sun, 10 Sep 2023 14:33:49 -0500 Subject: [PATCH] Fix windows cpack with debug --- CMakeInstallation.cmake | 4 +++- config/cmake/{patch.xml => patch.xml.in} | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) rename config/cmake/{patch.xml => patch.xml.in} (80%) diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index c7b6a1f6a26..070f26f0b92 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.in similarity index 80% rename from config/cmake/patch.xml rename to config/cmake/patch.xml.in index 1bdff3e7c2e..d6843e12697 100644 --- a/config/cmake/patch.xml +++ b/config/cmake/patch.xml.in @@ -1,5 +1,5 @@ - +