[Cmake-commits] CMake branch, next, updated. v2.8.4-1317-ge084018

[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  e084018c37ac01458204a1823d303c19a6dd1d52 (commit)
       via  dd04608132f6580df6fd857d5bfc4f67ad2b0ec3 (commit)
      from  c9480681012fc7101b34f76c9ff03b14b0ee7137 (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=e084018c37ac01458204a1823d303c19a6dd1d52
commit e084018c37ac01458204a1823d303c19a6dd1d52
Merge: c948068 dd04608
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Fri Apr 1 13:28:11 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 1 13:28:11 2011 -0400

    Merge topic 'drag-n-drop-components' into next
    
    dd04608 Fix KWStyle warnings


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd04608132f6580df6fd857d5bfc4f67ad2b0ec3
commit dd04608132f6580df6fd857d5bfc4f67ad2b0ec3
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Fri Apr 1 19:27:34 2011 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Fri Apr 1 19:27:34 2011 +0200

    Fix KWStyle warnings

diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx
index f0763be..83b6b64 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -128,7 +128,9 @@ int cmCPackDragNDropGenerator::PackageFiles()
     package_files.push_back(name);
     }
   std::sort(package_files.begin(), package_files.end());
-  package_files.erase(std::unique(package_files.begin(), package_files.end()), package_files.end());
+  package_files.erase(std::unique(package_files.begin(),
+                      package_files.end()),
+                      package_files.end());
 
 
   // loop to create dmg files
@@ -208,10 +210,11 @@ bool cmCPackDragNDropGenerator::RunCommand(cmOStringStream& command,
 }
 
 //----------------------------------------------------------------------
-int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir, const std::string& output_file)
+int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir,
+                                         const std::string& output_file)
 {
   // Get optional arguments ...
-  const std::string cpack_package_icon = this->GetOption("CPACK_PACKAGE_ICON") 
+  const std::string cpack_package_icon = this->GetOption("CPACK_PACKAGE_ICON")
     ? this->GetOption("CPACK_PACKAGE_ICON") : "";
   
   const std::string cpack_dmg_volume_name =
@@ -540,15 +543,19 @@ bool cmCPackDragNDropGenerator::SupportsComponentInstallation() const
   return true;
 }
 
-std::string cmCPackDragNDropGenerator::GetComponentInstallDirNameSuffix(const std::string& componentName)
+std::string
+cmCPackDragNDropGenerator::GetComponentInstallDirNameSuffix(
+                           const std::string& componentName)
 {
   // we want to group components together that go in the same dmg package
   std::string package_file_name = this->GetOption("CPACK_PACKAGE_FILE_NAME");
 
   // we have 3 mutually exclusive modes to work in
   // 1. all components in one package
-  // 2. each group goes in its own package with left over components in their own package
-  // 3. ignore groups - if grouping is defined, it is ignored and each component goes in its own package
+  // 2. each group goes in its own package with left over
+  //    components in their own package
+  // 3. ignore groups - if grouping is defined, it is ignored
+  //    and each component goes in its own package
 
   if(this->componentPackageMethod == ONE_PACKAGE)
     {
@@ -559,13 +566,15 @@ std::string cmCPackDragNDropGenerator::GetComponentInstallDirNameSuffix(const st
     {
     // We have to find the name of the COMPONENT GROUP
     // the current COMPONENT belongs to.
-    std::string groupVar = "CPACK_COMPONENT_" + cmSystemTools::UpperCase(componentName) + "_GROUP";
+    std::string groupVar = "CPACK_COMPONENT_" +
+                         cmSystemTools::UpperCase(componentName) + "_GROUP";
     const char* _groupName = GetOption(groupVar.c_str());
     if (_groupName)
       {
       std::string groupName = _groupName;
 
-      groupName = GetComponentPackageFileName(package_file_name, groupName, true);
+      groupName = GetComponentPackageFileName(package_file_name,
+                                              groupName, true);
       return groupName;
       }
     }
diff --git a/Source/CPack/cmCPackDragNDropGenerator.h b/Source/CPack/cmCPackDragNDropGenerator.h
index 3d05f99..808c618 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.h
+++ b/Source/CPack/cmCPackDragNDropGenerator.h
@@ -36,7 +36,8 @@ protected:
   bool CopyFile(cmOStringStream& source, cmOStringStream& target);
   bool RunCommand(cmOStringStream& command, std::string* output = 0);
 
-  std::string GetComponentInstallDirNameSuffix(const std::string& componentName);
+  std::string
+  GetComponentInstallDirNameSuffix(const std::string& componentName);
 
   int CreateDMG(const std::string& src_dir, const std::string& output_file);
 

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

Summary of changes:
 Source/CPack/cmCPackDragNDropGenerator.cxx |   25 +++++++++++++++++--------
 Source/CPack/cmCPackDragNDropGenerator.h   |    3 ++-
 2 files changed, 19 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake