summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-12-05 20:46:09 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-12-05 20:46:09 (GMT)
commit6a77f9821bcf0578a3bd310131bcc6757f7a0f04 (patch)
tree15670c84f53ae302ac39f699dad1924377a7f8f2
parentebb6e8e3be13fae63b4e9f427116ea8be2c61751 (diff)
downloadhdf5-6a77f9821bcf0578a3bd310131bcc6757f7a0f04.zip
hdf5-6a77f9821bcf0578a3bd310131bcc6757f7a0f04.tar.gz
hdf5-6a77f9821bcf0578a3bd310131bcc6757f7a0f04.tar.bz2
[svn-r24505] Correct MacOSX bundle packaging
-rw-r--r--CMakeInstallation.cmake5
1 files changed, 1 insertions, 4 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index ad8f0ef..5929380 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -234,12 +234,9 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
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 (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}")