[Cmake-commits] CMake branch, next, updated. v2.8.7-2873-g6cda641

[Eric Noulard]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6cda64102debcd49b3d24aaf69a91a254d381f83 (commit)
       via  4849e6ac63149cd9e582bac379d616a382948bbd (commit)
      from  ddea27f456ba17430cf65324c1ff860b6d147122 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cda64102debcd49b3d24aaf69a91a254d381f83
commit 6cda64102debcd49b3d24aaf69a91a254d381f83
Merge: ddea27f 4849e6a
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sat Feb 25 13:07:53 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 25 13:07:53 2012 -0500

    Merge topic 'CPack-fixCPackBundleDocLayout' into next
    
    4849e6a Fix layout of the CPack Bundle documentation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4849e6ac63149cd9e582bac379d616a382948bbd
commit 4849e6ac63149cd9e582bac379d616a382948bbd
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sat Feb 25 19:05:08 2012 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sat Feb 25 19:05:08 2012 +0100

    Fix layout of the CPack Bundle documentation
    
    CPACK_BUNDLE_STARTUP_SCRIPT was in fact CPACK_BUNDLE_STARTUP_COMMAND in
    the C++ code. The doc has been changed accordingly.

diff --git a/Modules/CPackBundle.cmake b/Modules/CPackBundle.cmake
index 007fc04..0da51e3 100644
--- a/Modules/CPackBundle.cmake
+++ b/Modules/CPackBundle.cmake
@@ -4,33 +4,32 @@
 # - CPack Bundle generator (Mac OS X) specific options
 #
 # Installers built on Mac OS X using the Bundle generator use the
-# aforementioned DragNDrop variables, plus the following Bundle-specific
-# parameters:
+# aforementioned DragNDrop (CPACK_DMG_xxx) variables, plus
+# the following Bundle-specific parameters (CPACK_BUNDLE_xxx).
 ##end
 #
 ##variable
-#   CPACK_BUNDLE_NAME - The name of the generated bundle.  This
-#   appears in the OSX finder as the bundle name.  Required.
+#  CPACK_BUNDLE_NAME - The name of the generated bundle. This
+#  appears in the OSX finder as the bundle name. Required.
 ##end
 #
 ##variable
-#   CPACK_BUNDLE_PLIST - Path to an OSX plist file that will be used
-#   as the Info.plist for the generated bundle.  This assumes that
-#   the caller has generated or specified their own Info.plist file.
-#   Required.
+#  CPACK_BUNDLE_PLIST - Path to an OSX plist file that will be used
+#  for the generated bundle. This assumes that the caller has generated
+#  or specified their own Info.plist file. Required.
 ##end
 #
 ##variable
-#   CPACK_BUNDLE_ICON - Path to an OSX icns file that will be used as
-#   the icon for the generated bundle.  This is the icon that appears
-#   in the OSX finder for the bundle, and in the OSX dock when the
-#   bundle is opened.  Required.
+#  CPACK_BUNDLE_ICON - Path to an OSX icon file that will be used as
+#  the icon for the generated bundle. This is the icon that appears in the
+#  OSX finder for the bundle, and in the OSX dock when the bundle is opened.
+#  Required.
 ##end
 #
 ##variable
-#   CPACK_BUNDLE_STARTUP_SCRIPT - Path to an executable or script that
-#   will be run whenever an end-user double-clicks the generated bundle
-#   in the OSX Finder.  Optional.
+#  CPACK_BUNDLE_STARTUP_COMMAND - Path to a startup script. This is a path to
+#  an executable or script that will be run whenever an end-user double-clicks
+#  the generated bundle in the OSX Finder. Optional.
 ##end
 
 #=============================================================================

-----------------------------------------------------------------------

Summary of changes:
 Modules/CPackBundle.cmake |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake