[Cmake-commits] CMake branch, next, updated. v3.6.1-1028-gc751592

[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  c751592abd68d027235597b20bf3ae4143a4a73c (commit)
       via  e29bfbf272dbf4ea5f6a89084ec1f503fcf0e4f7 (commit)
       via  55d9bfa9dd42912432eea3297507187084a7d154 (commit)
      from  62452bbd410a93493f9d6d5f668a5f4a3062d941 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c751592abd68d027235597b20bf3ae4143a4a73c
commit c751592abd68d027235597b20bf3ae4143a4a73c
Merge: 62452bb e29bfbf
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Aug 2 08:10:41 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 2 08:10:41 2016 -0400

    Merge topic 'wix-root-description' into next
    
    e29bfbf2 CPackWIX: Support custom title and description for the root feature
    55d9bfa9 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e29bfbf272dbf4ea5f6a89084ec1f503fcf0e4f7
commit e29bfbf272dbf4ea5f6a89084ec1f503fcf0e4f7
Author:     Michael Stürmer <michael.stuermer at schaeffler.com>
AuthorDate: Wed Jul 20 15:27:01 2016 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Aug 2 14:05:08 2016 +0200

    CPackWIX: Support custom title and description for the root feature
    
    These can now be specified through the WIX generator specific
    CPack variables CPACK_WIX_ROOT_FEATURE_TITLE and
    CPACK_WIX_ROOT_FEATURE_DESCRIPTION.

diff --git a/Help/release/dev/wix-root-description.rst b/Help/release/dev/wix-root-description.rst
new file mode 100644
index 0000000..24afed2
--- /dev/null
+++ b/Help/release/dev/wix-root-description.rst
@@ -0,0 +1,7 @@
+wix-root-description
+--------------------
+
+* The CPack WIX generator now supports
+  :variable:`CPACK_WIX_ROOT_FEATURE_TITLE` and
+  :variable:`CPACK_WIX_ROOT_FEATURE_DESCRIPTION` to allow the specification
+  of a custom title and description for the root feature element.
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index 3c90561..10926c0 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -237,6 +237,17 @@
 #  * ARPURLUPDATEINFO - Update information URL
 #  * ARPHELPTELEPHONE - Help and support telephone number
 #  * ARPSIZE - Size (in kilobytes) of the application
+#
+# .. variable:: CPACK_WIX_ROOT_FEATURE_TITLE
+#
+# Sets the name of the root install feature in the WIX installer. Same as
+# CPACK_COMPONENT_<compName>_DISPLAY_NAME for components.
+#
+# .. variable:: CPACK_WIX_ROOT_FEATURE_DESCRIPTION
+#
+# Sets the description of the root install feature in the WIX installer. Same as
+# CPACK_COMPONENT_<compName>_DESCRIPTION for components.
+#
 
 #=============================================================================
 # Copyright 2014-2015 Kitware, Inc.
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 97216c3..3ecc14d 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -464,7 +464,14 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles()
     return false;
   }
 
-  featureDefinitions.AddAttribute("Title", cpackPackageName);
+  std::string featureTitle = cpackPackageName;
+  if (const char* title = GetOption("CPACK_WIX_ROOT_FEATURE_TITLE")) {
+    featureTitle = title;
+  }
+  featureDefinitions.AddAttribute("Title", featureTitle);
+  if (const char* desc = GetOption("CPACK_WIX_ROOT_FEATURE_DESCRIPTION")) {
+    featureDefinitions.AddAttribute("Description", desc);
+  }
   featureDefinitions.AddAttribute("Level", "1");
   this->Patch->ApplyFragment("#PRODUCTFEATURE", featureDefinitions);
 

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

Summary of changes:
 Help/release/dev/wix-root-description.rst |    7 +++++++
 Modules/CPackWIX.cmake                    |   11 +++++++++++
 Source/CMakeVersion.cmake                 |    2 +-
 Source/CPack/WiX/cmCPackWIXGenerator.cxx  |    9 ++++++++-
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 Help/release/dev/wix-root-description.rst


hooks/post-receive
-- 
CMake