[Cmake-commits] CMake branch, master, updated. v3.4.1-734-gf9e3ca4

[Brad King]

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, master has been updated
       via  f9e3ca46cbeae4fb885398e8f7b90c784078b1d3 (commit)
       via  24cdb9df598a1c10fffc718255527729595442a1 (commit)
       via  de77d4a741c84e0b5774e79a0c84e945e25ad9f8 (commit)
       via  38d723b37e660223a9c8a125cf01ae5a6c9977ba (commit)
      from  5ffdd37b7ff8279ffffbf8cc5a007a541be0d7ff (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=f9e3ca46cbeae4fb885398e8f7b90c784078b1d3
commit f9e3ca46cbeae4fb885398e8f7b90c784078b1d3
Merge: 5ffdd37 24cdb9d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 18 10:55:35 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 18 10:55:35 2015 -0500

    Merge topic 'release-wix-config-ng'
    
    24cdb9df CMake: Mimic NSIS options dialog in WiX installer
    de77d4a7 CPackWIX: Allow multiple patch files and diagnose if any are missing
    38d723b3 CPackWIX: Allow patching of shortcut components


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

Summary of changes:
 CMakeCPackOptions.cmake.in                         |   29 +++++++++-
 Modules/CPackWIX.cmake                             |    3 +-
 Source/CPack/WiX/cmCPackWIXGenerator.cxx           |   13 ++++-
 Source/CPack/WiX/cmWIXPatch.cxx                    |   12 +++-
 Source/CPack/WiX/cmWIXPatch.h                      |    2 +-
 {Modules => Utilities/Release/WiX}/WIX.template.in |    5 +-
 Utilities/Release/WiX/cmake_extra_dialog.wxs       |   36 ++++++++++++
 Utilities/Release/WiX/install_dir.wxs              |   61 ++++++++++++++++++++
 Utilities/Release/WiX/patch_desktop_shortcut.xml   |    5 ++
 Utilities/Release/WiX/patch_path_env.xml           |   26 +++++++++
 .../{cpack_wix_ui_banner.jpg => WiX/ui_banner.jpg} |  Bin 2607 -> 2607 bytes
 .../{cpack_wix_ui_dialog.jpg => WiX/ui_dialog.jpg} |  Bin 13369 -> 13369 bytes
 12 files changed, 182 insertions(+), 10 deletions(-)
 copy {Modules => Utilities/Release/WiX}/WIX.template.in (86%)
 create mode 100644 Utilities/Release/WiX/cmake_extra_dialog.wxs
 create mode 100644 Utilities/Release/WiX/install_dir.wxs
 create mode 100644 Utilities/Release/WiX/patch_desktop_shortcut.xml
 create mode 100644 Utilities/Release/WiX/patch_path_env.xml
 rename Utilities/Release/{cpack_wix_ui_banner.jpg => WiX/ui_banner.jpg} (100%)
 rename Utilities/Release/{cpack_wix_ui_dialog.jpg => WiX/ui_dialog.jpg} (100%)


hooks/post-receive
-- 
CMake