[Cmake-commits] CMake branch, next, updated. v3.1.3-1344-g9c63fd7

[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  9c63fd71adf70c69364385d28acf8743e4d82f34 (commit)
       via  a2ccbffd8b4191f7b8b888fafde85eb5e7dbb2e4 (commit)
      from  9178b7cdf066b709fd70d83533ffc77abc69465b (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=9c63fd71adf70c69364385d28acf8743e4d82f34
commit 9c63fd71adf70c69364385d28acf8743e4d82f34
Merge: 9178b7c a2ccbff
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Feb 13 06:10:06 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 13 06:10:06 2015 -0500

    Merge topic 'wix-product-fragment' into next
    
    a2ccbffd CPackWIX: Extend the patching mechanism to allow adding content to <Product>.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2ccbffd8b4191f7b8b888fafde85eb5e7dbb2e4
commit a2ccbffd8b4191f7b8b888fafde85eb5e7dbb2e4
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Feb 13 11:57:20 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Feb 13 12:09:40 2015 +0100

    CPackWIX: Extend the patching mechanism to allow adding content to <Product>.

diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index 0a47e19..105df96 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -148,6 +148,9 @@
 #  Currently fragments can be injected into most
 #  Component, File and Directory elements.
 #
+#  The special Id ``#PRODUCT`` can be used to inject content
+#  into the ``<Product>`` element.
+#
 #  The following example illustrates how this works.
 #
 #  Given that the WiX generator creates the following XML element:
@@ -233,7 +236,7 @@
 #  * ARPSIZE - Size (in kilobytes) of the application
 
 #=============================================================================
-# Copyright 2014 Kitware, Inc.
+# Copyright 2014-2015 Kitware, Inc.
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
diff --git a/Modules/WIX.template.in b/Modules/WIX.template.in
index bbb7c88..c4fc83a 100644
--- a/Modules/WIX.template.in
+++ b/Modules/WIX.template.in
@@ -42,5 +42,6 @@
         <UIRef Id="$(var.CPACK_WIX_UI_REF)" />
 
         <?include "properties.wxi"?>
+        <?include "product_fragment.wxi"?>
     </Product>
 </Wix>
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 59c38e9..11d5437 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -1,6 +1,6 @@
 /*============================================================================
   CMake - Cross Platform Makefile Generator
-  Copyright 2000-2014 Kitware, Inc., Insight Software Consortium
+  Copyright 2012-2015 Kitware, Inc., Insight Software Consortium
 
   Distributed under the OSI-approved BSD License (the "License");
   see accompanying file Copyright.txt for details.
@@ -257,6 +257,7 @@ bool cmCPackWIXGenerator::PackageFilesImpl()
 
   CreateWiXVariablesIncludeFile();
   CreateWiXPropertiesIncludeFile();
+  CreateWiXProductFragmentIncludeFile();
 
   if(!CreateWiXSourceFiles())
     {
@@ -385,6 +386,17 @@ void cmCPackWIXGenerator::CreateWiXPropertiesIncludeFile()
     }
 }
 
+void cmCPackWIXGenerator::CreateWiXProductFragmentIncludeFile()
+{
+    std::string includeFilename =
+      this->CPackTopLevel + "/product_fragment.wxi";
+
+    cmWIXSourceWriter includeFile(
+      this->Logger, includeFilename, true);
+
+    this->Patch->ApplyFragment("#PRODUCT", includeFile);
+}
+
 void cmCPackWIXGenerator::CopyDefinition(
   cmWIXSourceWriter &source, std::string const& name)
 {
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h
index 8705d40..7035297 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.h
@@ -1,6 +1,6 @@
 /*============================================================================
   CMake - Cross Platform Makefile Generator
-  Copyright 2000-2012 Kitware, Inc.
+  Copyright 2012-2015 Kitware, Inc.
 
   Distributed under the OSI-approved BSD License (the "License");
   see accompanying file Copyright.txt for details.
@@ -76,6 +76,8 @@ private:
 
   void CreateWiXPropertiesIncludeFile();
 
+  void CreateWiXProductFragmentIncludeFile();
+
   void CopyDefinition(
     cmWIXSourceWriter &source, std::string const& name);
 

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

Summary of changes:


hooks/post-receive
-- 
CMake