[Cmake-commits] CMake branch, next, updated. v3.8.0-rc4-684-gdd98e44

[Kitware Robot]

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  dd98e44d61770bf483e7fc4d24aa99f50baa6d1c (commit)
       via  fde8dfa417e1862e6ca7f6b1e9cb5c4ed9f86b9c (commit)
       via  fb22ba6327355c7de2f54edffdd5bfc2ee814418 (commit)
      from  7271962cec742353ac27ea1c5bf2bbedfba6f823 (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=dd98e44d61770bf483e7fc4d24aa99f50baa6d1c
commit dd98e44d61770bf483e7fc4d24aa99f50baa6d1c
Merge: 7271962 fde8dfa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 4 19:37:14 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Apr 4 15:39:40 2017 -0400

    Stage topic 'cpack-wix-root'
    
    Topic-id: 23485
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/665


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fde8dfa417e1862e6ca7f6b1e9cb5c4ed9f86b9c
commit fde8dfa417e1862e6ca7f6b1e9cb5c4ed9f86b9c
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Apr 4 21:15:33 2017 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Apr 4 21:17:15 2017 +0200

    CPackWIX: Add documentation for CPACK_WIX_ROOT
    
    Fixes: #16774

diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index ed0223b..1dc37d4 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -279,6 +279,14 @@
 #  When unset generated installers will default installing to
 #  ``ProgramFiles<64>Folder``.
 #
+# .. variable:: CPACK_WIX_ROOT
+#
+#  This variable can optionally be set to the root directory
+#  of a custom WiX Toolset installation.
+#
+#  When unspecified CPack will try to locate a WiX Toolset
+#  installation via the ``WIX`` environment variable instead.
+#
 
 if(NOT CPACK_WIX_ROOT)
   file(TO_CMAKE_PATH "$ENV{WIX}" CPACK_WIX_ROOT)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb22ba6327355c7de2f54edffdd5bfc2ee814418
commit fb22ba6327355c7de2f54edffdd5bfc2ee814418
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Apr 4 21:14:29 2017 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Apr 4 21:17:15 2017 +0200

    CPackWIX: Fix variable documentation indentations

diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index 5a36e4c..ed0223b 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -243,20 +243,20 @@
 #
 # .. 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.
+#  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.
+#  Sets the description of the root install feature in the WIX installer. Same as
+#  CPACK_COMPONENT_<compName>_DESCRIPTION for components.
 #
 # .. variable:: CPACK_WIX_SKIP_PROGRAM_FOLDER
 #
-# If this variable is set to true, the default install location
-# of the generated package will be CPACK_PACKAGE_INSTALL_DIRECTORY directly.
-# The install location will not be located relatively below
-# ProgramFiles or ProgramFiles64.
+#  If this variable is set to true, the default install location
+#  of the generated package will be CPACK_PACKAGE_INSTALL_DIRECTORY directly.
+#  The install location will not be located relatively below
+#  ProgramFiles or ProgramFiles64.
 #
 #   .. note::
 #     Installers created with this feature do not take differences
@@ -270,14 +270,14 @@
 #
 # .. variable:: CPACK_WIX_ROOT_FOLDER_ID
 #
-# This variable allows specification of a custom root folder ID.
-# The generator specific ``<64>`` token can be used for
-# folder IDs that come in 32-bit and 64-bit variants.
-# In 32-bit builds the token will expand empty while in 64-bit builds
-# it will expand to ``64``.
+#  This variable allows specification of a custom root folder ID.
+#  The generator specific ``<64>`` token can be used for
+#  folder IDs that come in 32-bit and 64-bit variants.
+#  In 32-bit builds the token will expand empty while in 64-bit builds
+#  it will expand to ``64``.
 #
-# When unset generated installers will default installing to
-# ``ProgramFiles<64>Folder``.
+#  When unset generated installers will default installing to
+#  ``ProgramFiles<64>Folder``.
 #
 
 if(NOT CPACK_WIX_ROOT)

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

Summary of changes:
 Modules/CPackWIX.cmake |   38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake