[Cmake-commits] CMake branch, next, updated. v2.8.9-1083-g2052bd4

[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  2052bd49ea88f13900429bdfd22a0e66549a5984 (commit)
       via  2aad678f23ead1fa5fb87690b1df1ac2a1996108 (commit)
      from  18797e91e3992858f4bd9d8321c5405bdbc3ecc7 (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=2052bd49ea88f13900429bdfd22a0e66549a5984
commit 2052bd49ea88f13900429bdfd22a0e66549a5984
Merge: 18797e9 2aad678
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sun Oct 14 12:58:40 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Oct 14 12:58:40 2012 -0400

    Merge topic 'fix-some-CPackDoc-typos' into next
    
    2aad678 Document CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY and fix some typo.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2aad678f23ead1fa5fb87690b1df1ac2a1996108
commit 2aad678f23ead1fa5fb87690b1df1ac2a1996108
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sun Oct 14 14:58:19 2012 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sun Oct 14 14:58:19 2012 +0200

    Document CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY and fix some typo.

diff --git a/Source/CPack/cmCPackDocumentVariables.cxx b/Source/CPack/cmCPackDocumentVariables.cxx
index 7fa401c..6a841fa 100644
--- a/Source/CPack/cmCPackDocumentVariables.cxx
+++ b/Source/CPack/cmCPackDocumentVariables.cxx
@@ -31,15 +31,25 @@ void cmCPackDocumentVariables::DefineVariables(cmake* cm)
          "Each CPack generator as a built-in default value for this"
          " variable. E.g. Archive generators (ZIP, TGZ, ...) includes"
          " the top level whereas RPM or DEB don't. The user may override"
-         " the default value byt setting this variable.\n"
+         " the default value by setting this variable.\n"
          "There is a similar variable "
-         "CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY"
+         "CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY "
          "which may be used to override the behavior for the component"
-         "packaging case which may have different default value for"
-         "historical (now backward compatibility) reason.", false,
+         " packaging case which may have different default value for"
+         " historical (now backward compatibility) reason.", false,
          "Variables common to all CPack generators");
 
   cm->DefineProperty
+          ("CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY", cmProperty::VARIABLE,
+            "Boolean toggle to include/exclude top level directory "
+             "(component case).",
+            "Similar usage as CPACK_INCLUDE_TOPLEVEL_DIRECTORY"
+            " but for the component case. "
+            "See CPACK_INCLUDE_TOPLEVEL_DIRECTORY documentation for"
+            " the detail.", false,
+            "Variables common to all CPack generators");
+
+  cm->DefineProperty
           ("CPACK_SET_DESTDIR", cmProperty::VARIABLE,
            "Boolean toggle to make CPack use DESTDIR mechanism when"
            " packaging.", "DESTDIR means DESTination DIRectory."

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

Summary of changes:
 Source/CPack/cmCPackDocumentVariables.cxx |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake