[Cmake-commits] CMake branch, master, updated. v2.8.11.2-545-g29859c0

[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  29859c09afef684140e5cd0de528a5b2a7bf19e2 (commit)
       via  bf23891942d95a4075f349f6c4043647d47e546b (commit)
       via  155bb01bd5126f36066653a209a3209f6363a7cd (commit)
       via  bfa2e299ae9a8687c6f13e701c87e68b9e4a5054 (commit)
       via  6e51ea9870658ca39e9b3050caada121519da673 (commit)
       via  6d77e1ab3f6cfe5e2019a418da7c18cc3515ab54 (commit)
       via  8c0e32550cf8afbb8419dff3698915b550e9c86d (commit)
      from  f53ce89d6a309f5f44630c9a9ef12d7440828cd0 (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=29859c09afef684140e5cd0de528a5b2a7bf19e2
commit 29859c09afef684140e5cd0de528a5b2a7bf19e2
Merge: f53ce89 bf23891
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 22 09:48:32 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 22 09:48:32 2013 -0400

    Merge topic 'cpack-wix'
    
    bf23891 CPackWIX: Add support for custom WiX templates
    155bb01 CMakeCPack: Provide an upgrade guid for WiX
    bfa2e29 CPackWIX: Add option to specify the language(s) of the installer
    6e51ea9 CPackWIX: Handle multiple shortcuts in the start menu
    6d77e1a CPackWIX: Fix MSI package layout regression from parent
    8c0e325 CPackWIX: Handle CPACK_PACKAGE_EXECUTABLES (#13967)


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

Summary of changes:
 CMakeCPack.cmake                         |    2 +
 Modules/CPackWIX.cmake                   |   26 ++++++
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |  141 +++++++++++++++++++++++++++---
 Source/CPack/WiX/cmCPackWIXGenerator.h   |    6 +-
 Tests/CPackWiXGenerator/CMakeLists.txt   |    2 +
 5 files changed, 164 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake