[Cmake-commits] CMake branch, next, updated. v2.8.10-689-g79aee22

[Clinton Stimpson]

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  79aee22598f4972c7833957e0807643c81e81e33 (commit)
       via  bc0519be0690f3dd6e7082c9d32c0727213c1aa9 (commit)
      from  e9b41f45be1b137ad4c937c7b7a064c7e4504b60 (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=79aee22598f4972c7833957e0807643c81e81e33
commit 79aee22598f4972c7833957e0807643c81e81e33
Merge: e9b41f4 bc0519b
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Nov 1 14:07:43 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 1 14:07:43 2012 -0400

    Merge topic 'deb-rpm-all_components_in_one' into next
    
    bc0519b RPM/Deb: Fix KWStyle failures from previous commit.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc0519be0690f3dd6e7082c9d32c0727213c1aa9
commit bc0519be0690f3dd6e7082c9d32c0727213c1aa9
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Nov 1 11:56:37 2012 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Nov 1 11:57:17 2012 -0600

    RPM/Deb: Fix KWStyle failures from previous commit.

diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 8a41d0e..f99db58 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -79,7 +79,8 @@ int cmCPackDebGenerator::PackageOnePack(std::string initialTopLevel,
   // Tell CPackDeb.cmake the path where the component is.
   std::string component_path = "/";
   component_path += packageName;
-  this->SetOption("CPACK_DEB_PACKAGE_COMPONENT_PART_PATH", component_path.c_str());
+  this->SetOption("CPACK_DEB_PACKAGE_COMPONENT_PART_PATH",
+                  component_path.c_str());
   if (!this->ReadListFile("CPackDeb.cmake"))
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR,
@@ -205,7 +206,8 @@ int cmCPackDebGenerator::PackageComponentsAllInOne()
   // Tell CPackDeb.cmake the path where the component is.
   std::string component_path = "/";
   component_path += compInstDirName;
-  this->SetOption("CPACK_DEB_PACKAGE_COMPONENT_PART_PATH", component_path.c_str());
+  this->SetOption("CPACK_DEB_PACKAGE_COMPONENT_PART_PATH",
+                  component_path.c_str());
   if (!this->ReadListFile("CPackDeb.cmake"))
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR,
diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx
index af735d0..66a4194 100644
--- a/Source/CPack/cmCPackRPMGenerator.cxx
+++ b/Source/CPack/cmCPackRPMGenerator.cxx
@@ -80,7 +80,8 @@ int cmCPackRPMGenerator::PackageOnePack(std::string initialToplevel,
   // Tell CPackRPM.cmake the path where the component is.
   std::string component_path = "/";
   component_path += packageName;
-  this->SetOption("CPACK_RPM_PACKAGE_COMPONENT_PART_PATH", component_path.c_str());
+  this->SetOption("CPACK_RPM_PACKAGE_COMPONENT_PART_PATH",
+                  component_path.c_str());
   if (!this->ReadListFile("CPackRPM.cmake"))
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR,
@@ -185,7 +186,8 @@ int cmCPackRPMGenerator::PackageComponentsAllInOne()
   // Tell CPackRPM.cmake the path where the component is.
   std::string component_path = "/";
   component_path += compInstDirName;
-  this->SetOption("CPACK_RPM_PACKAGE_COMPONENT_PART_PATH", component_path.c_str());
+  this->SetOption("CPACK_RPM_PACKAGE_COMPONENT_PART_PATH",
+                  component_path.c_str());
   if (!this->ReadListFile("CPackRPM.cmake"))
     {
     cmCPackLogger(cmCPackLog::LOG_ERROR,

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

Summary of changes:
 Source/CPack/cmCPackDebGenerator.cxx |    6 ++++--
 Source/CPack/cmCPackRPMGenerator.cxx |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake