[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5858-g4fc1493

[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  4fc14932cb4a84d93731dc08b6cf3eb3fd03be2a (commit)
       via  fa576e2be8838c6a66cf315b40f8ee5d09034ffd (commit)
      from  ba191a11f0232e9b439dd9a7ba426b4ab7c7ead9 (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=4fc14932cb4a84d93731dc08b6cf3eb3fd03be2a
commit 4fc14932cb4a84d93731dc08b6cf3eb3fd03be2a
Merge: ba191a1 fa576e2
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Nov 26 16:15:33 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 26 16:15:33 2013 -0500

    Merge topic 'wix-components' into next
    
    fa576e2 CPackWiX: fix build warning


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa576e2be8838c6a66cf315b40f8ee5d09034ffd
commit fa576e2be8838c6a66cf315b40f8ee5d09034ffd
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Nov 26 21:59:33 2013 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Nov 26 21:59:33 2013 +0100

    CPackWiX: fix build warning

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index a55c08d..91701c2 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -435,7 +435,7 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
   shortcut_map_t globalShortcuts;
   if(Components.empty())
     {
-    AddComponentsToFeature(std::string(), toplevel, "ProductFeature",
+    AddComponentsToFeature(toplevel, "ProductFeature",
       directoryDefinitions, fileDefinitions, featureDefinitions,
       globalShortcuts);
     if(globalShortcuts.size())
@@ -457,8 +457,7 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
       std::string componentFeatureId = "CM_C_" + component.Name;
 
       shortcut_map_t featureShortcuts;
-      AddComponentsToFeature(component.Name,
-        componentPath, componentFeatureId,
+      AddComponentsToFeature(componentPath, componentFeatureId,
         directoryDefinitions, fileDefinitions,
         featureDefinitions, featureShortcuts);
       if(featureShortcuts.size())
@@ -635,7 +634,6 @@ bool cmCPackWIXGenerator::EmitFeatureForComponent(
 }
 
 bool cmCPackWIXGenerator::AddComponentsToFeature(
-  std::string const& cpackComponentName,
   std::string const& rootPath,
   std::string const& featureId,
   cmWIXSourceWriter& directoryDefinitions,
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h
index e42b9bd..84f68b6 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.h
@@ -91,7 +91,6 @@ private:
     cmCPackComponent const& component);
 
   bool AddComponentsToFeature(
-    std::string const& cpackComponentName,
     std::string const& rootPath,
     std::string const& featureId,
     cmWIXSourceWriter& directoryDefinitions,

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

Summary of changes:
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |    6 ++----
 Source/CPack/WiX/cmCPackWIXGenerator.h   |    1 -
 2 files changed, 2 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake