[Cmake-commits] CMake branch, next, updated. v2.8.4-1338-g1160bde

[Brad King]

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  1160bdef4f7da8d20eb82aedcdde5b398ac3c42b (commit)
       via  9c438240661c68da7c0b09b2d08a1facc4fe1dcc (commit)
      from  3ed8adfbb32ce4e8390183d9a469a1ac53348743 (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=1160bdef4f7da8d20eb82aedcdde5b398ac3c42b
commit 1160bdef4f7da8d20eb82aedcdde5b398ac3c42b
Merge: 3ed8adf 9c43824
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 4 15:01:01 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 4 15:01:01 2011 -0400

    Merge topic 'cpack-grouping-enum' into next
    
    9c43824 Fix KWStyle warnings


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c438240661c68da7c0b09b2d08a1facc4fe1dcc
commit 9c438240661c68da7c0b09b2d08a1facc4fe1dcc
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Fri Apr 1 19:21:51 2011 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 4 14:59:58 2011 -0400

    Fix KWStyle warnings

diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx
index 5b4625b..0ce5b01 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -254,7 +254,8 @@ int cmCPackArchiveGenerator::PackageFiles()
     // in this case you'll get 1 package for each component.
     else
       {
-      return PackageComponents(componentPackageMethod == ONE_PACKAGE_PER_COMPONENT);
+      return PackageComponents(componentPackageMethod ==
+                               ONE_PACKAGE_PER_COMPONENT);
       }
   }
 
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 582f3e6..5665404 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -250,7 +250,8 @@ int cmCPackDebGenerator::PackageFiles()
     // in this case you'll get 1 package for each component.
     else
       {
-      return PackageComponents(componentPackageMethod == ONE_PACKAGE_PER_COMPONENT);
+      return PackageComponents(componentPackageMethod ==
+                               ONE_PACKAGE_PER_COMPONENT);
       }
   }
   // CASE 3 : NON COMPONENT package.
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index 6d71ad2..c8a77d1 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -1307,10 +1307,10 @@ int cmCPackGenerator::PrepareGroupingKind()
     else
       {
       cmCPackLogger(cmCPackLog::LOG_WARNING, "["
-              << this->Name << "]"
-              << " requested component grouping type <"<< groupingType
-              << "> UNKNOWN not in (ALL_COMPONENTS_IN_ONE,IGNORE,ONE_PER_GROUP)"
-              << std::endl);
+          << this->Name << "]"
+          << " requested component grouping type <"<< groupingType
+          << "> UNKNOWN not in (ALL_COMPONENTS_IN_ONE,IGNORE,ONE_PER_GROUP)"
+          << std::endl);
       }
     }
 
@@ -1328,10 +1328,10 @@ int cmCPackGenerator::PrepareGroupingKind()
       method = ONE_PACKAGE_PER_COMPONENT;
       }
     cmCPackLogger(cmCPackLog::LOG_WARNING, "["
-              << this->Name << "]"
-              << " One package per component group requested, but NO component groups exist:"
-              << " Ignoring component group."
-              << std::endl);
+         << this->Name << "]"
+         << " One package per component group requested, "
+         << "but NO component groups exist: Ignoring component group."
+         << std::endl);
     }
 
   // if user specified packaging method, override the default packaging method
@@ -1349,7 +1349,8 @@ int cmCPackGenerator::PrepareGroupingKind()
 
   cmCPackLogger(cmCPackLog::LOG_VERBOSE,  "["
         << this->Name << "]"
-        << " requested component grouping = " << method_names[componentPackageMethod]
+        << " requested component grouping = "
+        << method_names[componentPackageMethod]
         << std::endl);
 
   return 1;
diff --git a/Source/CPack/cmCPackGenerator.h b/Source/CPack/cmCPackGenerator.h
index f09c2a7..05d95b8 100644
--- a/Source/CPack/cmCPackGenerator.h
+++ b/Source/CPack/cmCPackGenerator.h
@@ -248,14 +248,16 @@ protected:
     ONE_PACKAGE,
     /* one package for each component */
     ONE_PACKAGE_PER_COMPONENT,
-    /* one package for each group, with left over components in their own package */
+    /* one package for each group,
+     * with left over components in their own package */
     ONE_PACKAGE_PER_GROUP,
     UNKNOWN_COMPONENT_PACKAGE_METHOD
   };
 
   /**
    * The component package method
-   * The default is ONE_PACKAGE_PER_GROUP, and generators may override the default
+   * The default is ONE_PACKAGE_PER_GROUP,
+   * and generators may override the default
    * before PrepareGroupingKind() is called.
    */
   ComponentPackageMethod componentPackageMethod;
diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx
index 9f55d23..1a6c3be 100644
--- a/Source/CPack/cmCPackRPMGenerator.cxx
+++ b/Source/CPack/cmCPackRPMGenerator.cxx
@@ -215,7 +215,8 @@ int cmCPackRPMGenerator::PackageFiles()
     // in this case you'll get 1 package for each component.
     else
       {
-      return PackageComponents(componentPackageMethod == ONE_PACKAGE_PER_COMPONENT);
+      return PackageComponents(componentPackageMethod ==
+                               ONE_PACKAGE_PER_COMPONENT);
       }
   }
   // CASE 3 : NON COMPONENT package.

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

Summary of changes:


hooks/post-receive
-- 
CMake