[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5465-gf0449b4

[Nils Gladitz]

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  f0449b4421c4c972f5ad8fa5023c2214f7be42e4 (commit)
       via  2751b934a3db08ae2a543ece43e55b55c2a5de41 (commit)
      from  997cf874b5665c652c6be9c59fcf47f8751884f1 (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=f0449b4421c4c972f5ad8fa5023c2214f7be42e4
commit f0449b4421c4c972f5ad8fa5023c2214f7be42e4
Merge: 997cf87 2751b93
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Nov 19 15:23:32 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 19 15:23:32 2013 -0500

    Merge topic 'add-missing-parent-group' into next
    
    2751b93 CPackComponent: handle the documented PARENT_GROUP parameter


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2751b934a3db08ae2a543ece43e55b55c2a5de41
commit 2751b934a3db08ae2a543ece43e55b55c2a5de41
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Nov 19 21:22:44 2013 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Nov 19 21:22:44 2013 +0100

    CPackComponent: handle the documented PARENT_GROUP parameter

diff --git a/Modules/CPackComponent.cmake b/Modules/CPackComponent.cmake
index aff8764..1433d9e 100644
--- a/Modules/CPackComponent.cmake
+++ b/Modules/CPackComponent.cmake
@@ -446,7 +446,7 @@ endmacro()
 macro(cpack_add_component_group grpname)
   string(TOUPPER ${grpname} CPACK_ADDGRP_UNAME)
   cpack_parse_arguments(CPACK_COMPONENT_GROUP_${CPACK_ADDGRP_UNAME}
-    "DISPLAY_NAME;DESCRIPTION"
+    "DISPLAY_NAME;DESCRIPTION;PARENT_GROUP"
     "EXPANDED;BOLD_TITLE"
     ${ARGN}
     )

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

Summary of changes:
 Modules/CPackComponent.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake