Advertisement
Guest User

hdf5-1.8.12 patched release

a guest
Jan 26th, 2014
91
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 4.67 KB | None | 0 0
  1. diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
  2. index 18464ac..24044c6 100644
  3. --- a/CMakeInstallation.cmake
  4. +++ b/CMakeInstallation.cmake
  5. @@ -229,23 +229,27 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
  6.      SET (CPACK_PACKAGE_ICON "${HDF5_RESOURCES_DIR}/hdf.gif")
  7.      SET (CPACK_SET_DESTDIR TRUE) # Required when packaging, and set CMAKE_INSTALL_PREFIX to "/".
  8.      
  9. -#    LIST (APPEND CPACK_GENERATOR "Bundle")
  10. -    SET (CPACK_BUNDLE_NAME "${HDF5_PACKAGE_STRING}")
  11. -    SET (CPACK_BUNDLE_LOCATION "/")    # make sure CMAKE_INSTALL_PREFIX ends in /
  12. -    SET (CMAKE_INSTALL_PREFIX "/${CPACK_BUNDLE_NAME}.framework/Versions/${CPACK_PACKAGE_VERSION}/${CPACK_PACKAGE_NAME}/")
  13. -    SET (CPACK_BUNDLE_ICON "${HDF5_RESOURCES_DIR}/hdf.gif")
  14. -    SET (CPACK_BUNDLE_PLIST "${HDF5_BINARY_DIR}/CMakeFiles/Info.plist")
  15. -#    SET (CPACK_BUNDLE_STARTUP_COMMAND "${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-startup.sh")
  16. -    SET (CPACK_APPLE_GUI_INFO_STRING "HDF5 (Hierarchical Data Format 5) Software Library and Utilities")
  17. -    SET (CPACK_APPLE_GUI_COPYRIGHT "Copyright © 2006-2013 by The HDF Group. All rights reserved.")
  18. -    SET (CPACK_SHORT_VERSION_STRING "${CPACK_PACKAGE_VERSION}")
  19. -    #-----------------------------------------------------------------------------
  20. -    # Configure the Info.plist file for the install bundle
  21. -    #-----------------------------------------------------------------------------
  22. -    CONFIGURE_FILE (
  23. -        ${HDF5_RESOURCES_DIR}/CPack.Info.plist.in
  24. -        ${HDF5_BINARY_DIR}/CMakeFiles/Info.plist @ONLY
  25. -    )
  26. +    IF (HDF5_PACK_MACOSX_BUNDLE)
  27. +      LIST (APPEND CPACK_GENERATOR "Bundle")
  28. +      SET (CPACK_BUNDLE_NAME "${HDF5_PACKAGE_STRING}")
  29. +      SET (CPACK_BUNDLE_LOCATION "/")    # make sure CMAKE_INSTALL_PREFIX ends in /
  30. +      IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
  31. +        SET (CMAKE_INSTALL_PREFIX "/${CPACK_BUNDLE_NAME}.framework/Versions/${CPACK_PACKAGE_VERSION}/${CPACK_PACKAGE_NAME}/")
  32. +      ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
  33. +      SET (CPACK_BUNDLE_ICON "${HDF5_RESOURCES_DIR}/hdf.gif")
  34. +      SET (CPACK_BUNDLE_PLIST "${HDF5_BINARY_DIR}/CMakeFiles/Info.plist")
  35. +#      SET (CPACK_BUNDLE_STARTUP_COMMAND "${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-startup.sh")
  36. +      SET (CPACK_APPLE_GUI_INFO_STRING "HDF5 (Hierarchical Data Format 5) Software Library and Utilities")
  37. +      SET (CPACK_APPLE_GUI_COPYRIGHT "Copyright © 2006-2013 by The HDF Group. All rights reserved.")
  38. +      SET (CPACK_SHORT_VERSION_STRING "${CPACK_PACKAGE_VERSION}")
  39. +      #-----------------------------------------------------------------------------
  40. +      # Configure the Info.plist file for the install bundle
  41. +      #-----------------------------------------------------------------------------
  42. +      CONFIGURE_FILE (
  43. +          ${HDF5_RESOURCES_DIR}/CPack.Info.plist.in
  44. +          ${HDF5_BINARY_DIR}/CMakeFiles/Info.plist @ONLY
  45. +      )
  46. +    ENDIF(HDF5_PACK_MACOSX_BUNDLE)
  47.    ELSE (WIN32)
  48.      LIST (APPEND CPACK_GENERATOR "STGZ")
  49.      SET (CPACK_PACKAGING_INSTALL_PREFIX "/usr")
  50. diff --git a/README.txt b/README.txt
  51. index f2fbb2d..ae91723 100644
  52. --- a/README.txt
  53. +++ b/README.txt
  54. @@ -1,4 +1,4 @@
  55. -HDF5 version 1.8.12 released on 2013-11-04
  56. +HDF5 version 1.8.12 released on 2013-11-21
  57.  Please refer to the release_docs/INSTALL file for installation instructions.
  58.  ------------------------------------------------------------------------------
  59.  
  60. diff --git a/configure.ac b/configure.ac
  61. index 97db9eb..8baa56a 100644
  62. --- a/configure.ac
  63. +++ b/configure.ac
  64. @@ -16,7 +16,7 @@
  65.  ## ----------------------------------------------------------------------
  66.  ## Initialize configure.
  67.  ##
  68. -AC_REVISION($Id: configure.ac 24276 2013-10-09 22:00:11Z epourmal $)
  69. +AC_REVISION($Id: configure.ac 24404 2013-11-04 22:57:14Z epourmal $)
  70.  AC_PREREQ([2.69])
  71.  
  72.  ## AC_INIT takes the name of the package, the version number, and an
  73. diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
  74. index aab7a9e..f3dcbcd 100644
  75. --- a/release_docs/RELEASE.txt
  76. +++ b/release_docs/RELEASE.txt
  77. @@ -1,4 +1,4 @@
  78. -HDF5 version 1.8.12 released on 2013-11-04
  79. +HDF5 version 1.8.12 released on 2013-11-21
  80.  ================================================================================
  81.  
  82.  INTRODUCTION
  83. @@ -126,6 +126,11 @@ Bug Fixes since HDF5-1.8.11
  84.      - HDF5 rpaths are no longer encoded in the library files when configured
  85.        with --disable-sharedlib-rpath. (LRK-2013-09-23 - HDFFV-8276)
  86.  
  87. +    CMake
  88. +    -----
  89. +    - Fix installation problem for Mac OS X reported on FORUM.
  90. +      (ADB - 2013/11/20)
  91. +
  92.      Library
  93.      -------
  94.      - Added const qualifier to source buffer parameters in H5Dgather and
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement