[Cmake-commits] CMake branch, next, updated. v2.8.2-405-gab16c28

[David Cole]

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  ab16c28c59cbdf97f1d2f034f4dea7c53954420a (commit)
       via  cf4a50bcdb66b31ceefbe97ec7b6b4d3f1b327de (commit)
       via  39886c405ae06840fb221fee77acbcc3e2993a8f (commit)
      from  d08a37ee2450c68eb410f4795ed5bc85c1dcd92e (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=ab16c28c59cbdf97f1d2f034f4dea7c53954420a
commit ab16c28c59cbdf97f1d2f034f4dea7c53954420a
Merge: d08a37e cf4a50b
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Aug 11 11:47:40 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 11 11:47:40 2010 -0400

    Merge topic 'improve-cpack-docs' into next
    
    cf4a50b Add documentation for CPACK_PROJECT_CONFIG_FILE.
    39886c4 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf4a50bcdb66b31ceefbe97ec7b6b4d3f1b327de
commit cf4a50bcdb66b31ceefbe97ec7b6b4d3f1b327de
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Aug 11 11:40:11 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Aug 11 11:40:11 2010 -0400

    Add documentation for CPACK_PROJECT_CONFIG_FILE.

diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 668a62a..7033e31 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -19,9 +19,41 @@
 # described below, for more information about component-specific
 # installations.
 #
-# Before including the CPack module, there are a variety of variables
-# that can be set to customize the resulting installers. The most
-# commonly-used variables are:
+# The CPACK_GENERATOR variable has different meanings in different
+# contexts. In your CMakeLists.txt file, CPACK_GENERATOR is a
+# *list of generators*: when run with no other arguments, CPack
+# will iterate over that list and produce one package for each
+# generator. In a CPACK_PROJECT_CONFIG_FILE, though, CPACK_GENERATOR
+# is a *string naming a single generator*. If you need per-cpack-
+# generator logic to control *other* cpack settings, then you need
+# a CPACK_PROJECT_CONFIG_FILE.
+#
+# The CMake source tree itself contains a CPACK_PROJECT_CONFIG_FILE.
+# See the top level file CMakeCPackOptions.cmake.in for an example.
+#
+# If set, the CPACK_PROJECT_CONFIG_FILE is included automatically
+# on a per-generator basis. It only need contain overrides.
+#
+# Here's how it works:
+# - cpack runs
+# - it includes CPackConfig.cmake
+# - it iterates over the generators listed in that file's
+#     CPACK_GENERATOR list variable (unless told to use just a
+#     specific one via -G on the command line...)
+#
+# - foreach generator, it then
+#   - sets CPACK_GENERATOR to the one currently being iterated
+#   - includes the CPACK_PROJECT_CONFIG_FILE
+#   - produces the package for that generator
+#
+# This is the key: For each generator listed in CPACK_GENERATOR
+# in CPackConfig.cmake, cpack will *reset* CPACK_GENERATOR
+# internally to *the one currently being used* and then include
+# the CPACK_PROJECT_CONFIG_FILE.
+#
+# Before including this CPack module in your CMakeLists.txt file,
+# there are a variety of variables that can be set to customize
+# the resulting installers. The most commonly-used variables are:
 #
 #   CPACK_PACKAGE_NAME - The name of the package (or application). If
 #   not specified, defaults to the project name.
@@ -48,6 +80,11 @@
 #   CPACK_PACKAGE_INSTALL_DIRECTORY - Installation directory on the
 #   target system, e.g., "CMake 2.5".
 #
+#   CPACK_PROJECT_CONFIG_FILE - File included at cpack time, once per
+#   generator after setting CPACK_GENERATOR to the actual generator
+#   being used. Allows per-generator setting of CPACK_* variables at
+#   cpack time.
+#
 #   CPACK_RESOURCE_FILE_LICENSE - License file for the project, which
 #   will typically be displayed to the user (often with an explicit
 #   "Accept" button, for graphical installers) prior to installation.

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

Summary of changes:
 Modules/CPack.cmake               |   43 ++++++++++++++++++++++++++++++++++--
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 41 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake