summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-09-12 15:13:37 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-09-12 15:13:37 (GMT)
commit9feb3e641d66703bbe9136700840e11b0ec45a11 (patch)
tree15d0893d889d2b38e3edb0e145128b3ef76607e3
parent2465c432f02e70b733c2c3ebaf154c4b4811821e (diff)
downloadhdf5-9feb3e641d66703bbe9136700840e11b0ec45a11.zip
hdf5-9feb3e641d66703bbe9136700840e11b0ec45a11.tar.gz
hdf5-9feb3e641d66703bbe9136700840e11b0ec45a11.tar.bz2
[svn-r24126] Correct mac pinifo.list vars
-rw-r--r--CMakeInstallation.cmake15
-rw-r--r--config/cmake/CPack.Info.plist.in57
2 files changed, 35 insertions, 37 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index 8a7cf16..4a81cf9 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -230,6 +230,15 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
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
#-----------------------------------------------------------------------------
@@ -237,12 +246,6 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
${HDF5_RESOURCES_DIR}/CPack.Info.plist.in
${HDF5_BINARY_DIR}/CMakeFiles/Info.plist @ONLY
)
- 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")
ELSE (WIN32)
SET (CPACK_PACKAGING_INSTALL_PREFIX "/usr")
SET (CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE ON)
diff --git a/config/cmake/CPack.Info.plist.in b/config/cmake/CPack.Info.plist.in
index a701a61..6cf2a94 100644
--- a/config/cmake/CPack.Info.plist.in
+++ b/config/cmake/CPack.Info.plist.in
@@ -1,37 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-
<plist version="1.0">
<dict>
-<key>IFMajorVersion</key>
-<integer>@CPACK_PACKAGE_VERSION_MAJOR@</integer>
-<key>IFMinorVersion</key>
-<integer>@CPACK_PACKAGE_VERSION_MINOR@</integer>
-<key>IFPkgFlagAllowBackRev</key>
-<false/>
-<key>IFPkgFlagAuthorizationAction</key>
-<string>AdminAuthorization</string>
-<key>IFPkgFlagDefaultLocation</key>
-<string>@CPACK_PACKAGE_DEFAULT_LOCATION@</string>
-<key>IFPkgFlagInstallFat</key>
-<false/>
-<key>IFPkgFlagIsRequired</key>
-<false/>
-<key>IFPkgFlagOverwritePermissions</key>
-<true/>
-<key>IFPkgFlagRelocatable</key>
-<@CPACK_PACKAGE_RELOCATABLE@/>
-<key>IFPkgFlagRestartAction</key>
-<string>NoRestart</string>
-<key>IFPkgFlagRootVolumeOnly</key>
-<false/>
-<key>IFPkgFlagUpdateInstalledLanguages</key>
-<false/>
-<key>IFPkgFlagUseUserMask</key>
-<false/>
-<key>IFPkgFormatVersion</key>
-<real>0.10000000149011612</real>
-<key>CFBundleIdentifier</key>
-<string>org.@CPACK_PACKAGE_VENDOR@.@CPACK_PACKAGE_NAME@@CPACK_MODULE_VERSION_SUFFIX@</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>@CPACK_PACKAGE_FILE_NAME@</string>
+ <key>CFBundleIconFile</key>
+ <string>@CPACK_BUNDLE_ICON@</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.@CPACK_PACKAGE_VENDOR@.@CPACK_PACKAGE_NAME@@CPACK_MODULE_VERSION_SUFFIX@</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>FMWK</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>@CPACK_PACKAGE_VERSIO@</string>
+ <key>CFBundleShortVersionString</key>
+ <string>@CPACK_SHORT_VERSION_STRING@</string>
+ <key>CSResourcesFileMapped</key>
+ <true/>
+ <key>CFBundleName</key>
+ <string>@CPACK_BUNDLE_NAME@</string>
+ <key>CFBundleGetInfoString</key>
+ <string>@CPACK_APPLE_GUI_INFO_STRING@</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>@CPACK_APPLE_GUI_COPYRIGHT@</string>
</dict>
</plist>