diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-09-11 12:45:36 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-11 12:45:36 (GMT) |
| commit | fbb9ad25963c5ca8c2f7827c30e9543df5528778 (patch) | |
| tree | ac6866e5c3c75559f0f93aea641693f462493ef5 | |
| parent | 117d579c326f64d09d71e28cb0135bbd16a5232e (diff) | |
| download | hdf5-fbb9ad25963c5ca8c2f7827c30e9543df5528778.zip hdf5-fbb9ad25963c5ca8c2f7827c30e9543df5528778.tar.gz hdf5-fbb9ad25963c5ca8c2f7827c30e9543df5528778.tar.bz2 | |
Fix windows cpack with debug (#3525)
| -rw-r--r-- | CMakeInstallation.cmake | 4 | ||||
| -rw-r--r-- | config/cmake/patch.xml.in (renamed from config/cmake/patch.xml) | 2 |
2 files changed, 4 insertions, 2 deletions
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.in index 1bdff3e..d6843e1 100644 --- a/config/cmake/patch.xml +++ b/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]" |