From f1bb1129f374aefd518d5e42ff5e8d27f376bda4 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 9 Aug 2013 09:55:22 -0500
Subject: [svn-r23979] Correct Packaging var names.

---
 CMakeLists.txt                   |  8 ++++----
 MANIFEST                         |  1 +
 config/cmake/CPack.Info.plist.in | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 config/cmake/CPack.Info.plist.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc6e383..577f8ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1230,12 +1230,12 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
     # Configure the Info.plist file for the install bundle
     #-----------------------------------------------------------------------------
     CONFIGURE_FILE (
-        ${CMAKE_ROOT}/Modules/CPack.Info.plist.in
+        ${HDF5_RESOURCES_DIR}/CPack.Info.plist.in
         ${HDF5_BINARY_DIR}/CMakeFiles/Info.plist @ONLY
     )
-    SET (CMAKE_BUNDLE_NAME "${HDF5_PACKAGE_STRING}")
-    SET (CMAKE_BUNDLE_LOCATION "/")    # make sure CMAKE_INSTALL_PREFIX ends in /
-    SET (CMAKE_INSTALL_PREFIX "/${CMAKE_BUNDLE_NAME}.framework/Versions/${CPACK_PACKAGE_VERSION}/${CPACK_PACKAGE_NAME}")
+    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")
diff --git a/MANIFEST b/MANIFEST
index 436ecb1..2851a62 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2412,6 +2412,7 @@
 ./config/cmake/CTestCustom.cmake
 ./config/cmake/ConfigureChecks.cmake
 ./config/cmake/CPack.cmake
+./config/cmake/CPack.Info.plist.in
 ./config/cmake/hdf.gif
 ./config/cmake/NSIS.template.in
 ./config/cmake/NSIS.InstallOptions.ini.in
diff --git a/config/cmake/CPack.Info.plist.in b/config/cmake/CPack.Info.plist.in
new file mode 100644
index 0000000..a701a61
--- /dev/null
+++ b/config/cmake/CPack.Info.plist.in
@@ -0,0 +1,37 @@
+<?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>
+</dict>
+</plist>
-- 
cgit v0.12