Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
- index 18464ac..24044c6 100644
- --- a/CMakeInstallation.cmake
- +++ b/CMakeInstallation.cmake
- @@ -229,23 +229,27 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
- SET (CPACK_PACKAGE_ICON "${HDF5_RESOURCES_DIR}/hdf.gif")
- SET (CPACK_SET_DESTDIR TRUE) # Required when packaging, and set CMAKE_INSTALL_PREFIX to "/".
- -# LIST (APPEND CPACK_GENERATOR "Bundle")
- - SET (CPACK_BUNDLE_NAME "${HDF5_PACKAGE_STRING}")
- - SET (CPACK_BUNDLE_LOCATION "/") # make sure CMAKE_INSTALL_PREFIX ends in /
- - SET (CMAKE_INSTALL_PREFIX "/${CPACK_BUNDLE_NAME}.framework/Versions/${CPACK_PACKAGE_VERSION}/${CPACK_PACKAGE_NAME}/")
- - SET (CPACK_BUNDLE_ICON "${HDF5_RESOURCES_DIR}/hdf.gif")
- - SET (CPACK_BUNDLE_PLIST "${HDF5_BINARY_DIR}/CMakeFiles/Info.plist")
- -# SET (CPACK_BUNDLE_STARTUP_COMMAND "${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-startup.sh")
- - SET (CPACK_APPLE_GUI_INFO_STRING "HDF5 (Hierarchical Data Format 5) Software Library and Utilities")
- - SET (CPACK_APPLE_GUI_COPYRIGHT "Copyright © 2006-2013 by The HDF Group. All rights reserved.")
- - SET (CPACK_SHORT_VERSION_STRING "${CPACK_PACKAGE_VERSION}")
- - #-----------------------------------------------------------------------------
- - # Configure the Info.plist file for the install bundle
- - #-----------------------------------------------------------------------------
- - CONFIGURE_FILE (
- - ${HDF5_RESOURCES_DIR}/CPack.Info.plist.in
- - ${HDF5_BINARY_DIR}/CMakeFiles/Info.plist @ONLY
- - )
- + IF (HDF5_PACK_MACOSX_BUNDLE)
- + LIST (APPEND CPACK_GENERATOR "Bundle")
- + SET (CPACK_BUNDLE_NAME "${HDF5_PACKAGE_STRING}")
- + SET (CPACK_BUNDLE_LOCATION "/") # make sure CMAKE_INSTALL_PREFIX ends in /
- + IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
- + SET (CMAKE_INSTALL_PREFIX "/${CPACK_BUNDLE_NAME}.framework/Versions/${CPACK_PACKAGE_VERSION}/${CPACK_PACKAGE_NAME}/")
- + ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
- + SET (CPACK_BUNDLE_ICON "${HDF5_RESOURCES_DIR}/hdf.gif")
- + SET (CPACK_BUNDLE_PLIST "${HDF5_BINARY_DIR}/CMakeFiles/Info.plist")
- +# SET (CPACK_BUNDLE_STARTUP_COMMAND "${HDF5_BINARY_DIR}/CMakeFiles/${HDF5_PACKAGE}${HDF_PACKAGE_EXT}-startup.sh")
- + SET (CPACK_APPLE_GUI_INFO_STRING "HDF5 (Hierarchical Data Format 5) Software Library and Utilities")
- + SET (CPACK_APPLE_GUI_COPYRIGHT "Copyright © 2006-2013 by The HDF Group. All rights reserved.")
- + SET (CPACK_SHORT_VERSION_STRING "${CPACK_PACKAGE_VERSION}")
- + #-----------------------------------------------------------------------------
- + # Configure the Info.plist file for the install bundle
- + #-----------------------------------------------------------------------------
- + CONFIGURE_FILE (
- + ${HDF5_RESOURCES_DIR}/CPack.Info.plist.in
- + ${HDF5_BINARY_DIR}/CMakeFiles/Info.plist @ONLY
- + )
- + ENDIF(HDF5_PACK_MACOSX_BUNDLE)
- ELSE (WIN32)
- LIST (APPEND CPACK_GENERATOR "STGZ")
- SET (CPACK_PACKAGING_INSTALL_PREFIX "/usr")
- diff --git a/README.txt b/README.txt
- index f2fbb2d..ae91723 100644
- --- a/README.txt
- +++ b/README.txt
- @@ -1,4 +1,4 @@
- -HDF5 version 1.8.12 released on 2013-11-04
- +HDF5 version 1.8.12 released on 2013-11-21
- Please refer to the release_docs/INSTALL file for installation instructions.
- ------------------------------------------------------------------------------
- diff --git a/configure.ac b/configure.ac
- index 97db9eb..8baa56a 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -16,7 +16,7 @@
- ## ----------------------------------------------------------------------
- ## Initialize configure.
- ##
- -AC_REVISION($Id: configure.ac 24276 2013-10-09 22:00:11Z epourmal $)
- +AC_REVISION($Id: configure.ac 24404 2013-11-04 22:57:14Z epourmal $)
- AC_PREREQ([2.69])
- ## AC_INIT takes the name of the package, the version number, and an
- diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
- index aab7a9e..f3dcbcd 100644
- --- a/release_docs/RELEASE.txt
- +++ b/release_docs/RELEASE.txt
- @@ -1,4 +1,4 @@
- -HDF5 version 1.8.12 released on 2013-11-04
- +HDF5 version 1.8.12 released on 2013-11-21
- ================================================================================
- INTRODUCTION
- @@ -126,6 +126,11 @@ Bug Fixes since HDF5-1.8.11
- - HDF5 rpaths are no longer encoded in the library files when configured
- with --disable-sharedlib-rpath. (LRK-2013-09-23 - HDFFV-8276)
- + CMake
- + -----
- + - Fix installation problem for Mac OS X reported on FORUM.
- + (ADB - 2013/11/20)
- +
- Library
- -------
- - Added const qualifier to source buffer parameters in H5Dgather and
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement