[Cmake-commits] CMake branch, next, updated. v2.8.3-725-g4f3ede9

[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  4f3ede998ddb93d8e14ffcc2ff4547d984f84cf9 (commit)
       via  12a7125b323fe2d996fd536f2808a94f6e02e438 (commit)
      from  0be0d8e285fca08a9491195529931f2002133c8c (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=4f3ede998ddb93d8e14ffcc2ff4547d984f84cf9
commit 4f3ede998ddb93d8e14ffcc2ff4547d984f84cf9
Merge: 0be0d8e 12a7125
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Wed Dec 1 15:03:50 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 1 15:03:50 2010 -0500

    Merge topic 'CPack-Bug11452-ComponentBreakage-v2' into next
    
    12a7125 CPack Fix KWStyle error


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12a7125b323fe2d996fd536f2808a94f6e02e438
commit 12a7125b323fe2d996fd536f2808a94f6e02e438
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Wed Dec 1 21:00:38 2010 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Wed Dec 1 21:00:38 2010 +0100

    CPack Fix KWStyle error

diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx
index 8bbf699..ded329d 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -232,7 +232,9 @@ int cmCPackArchiveGenerator::PackageFiles()
     // CASE 1 : COMPONENT ALL-IN-ONE package
     // If ALL GROUPS or ALL COMPONENTS in ONE package has been requested
     // then the package file is unique and should be open here.
-    if (allComponentInOne || (allGroupInOne && (!this->ComponentGroups.empty())))
+    if (allComponentInOne ||
+        (allGroupInOne && (!this->ComponentGroups.empty()))
+       )
       {
       return PackageComponentsAllInOne(allComponentInOne);
       }

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

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


hooks/post-receive
-- 
CMake