[Cmake-commits] CMake branch, master, updated. v2.8.12.1-954-geb20fab

[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  eb20fab73673c6a3cbcc705c6d22a27ab54740d8 (commit)
       via  8632233a2fc0e27106977a820b6b439e72b45383 (commit)
      from  3b00ff84d2759567564fd81b9d28ea6b952ec22e (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=eb20fab73673c6a3cbcc705c6d22a27ab54740d8
commit eb20fab73673c6a3cbcc705c6d22a27ab54740d8
Merge: 3b00ff8 8632233
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 19 10:13:47 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 19 10:13:47 2013 -0500

    Merge topic 'wix-fragment-injection'
    
    8632233 CPackWiX: allow customization of generated WiX sources


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

Summary of changes:
 Modules/CPackWIX.cmake                   |   51 +++++++++++
 Source/CMakeLists.txt                    |    1 +
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |   74 +++++++++++++++
 Source/CPack/WiX/cmCPackWIXGenerator.h   |   11 +++
 Source/CPack/WiX/cmWIXPatchParser.cxx    |  145 ++++++++++++++++++++++++++++++
 Source/CPack/WiX/cmWIXPatchParser.h      |   75 +++++++++++++++
 Tests/CPackWiXGenerator/CMakeLists.txt   |    2 +
 Tests/CPackWiXGenerator/patch.xml        |    7 ++
 8 files changed, 366 insertions(+), 0 deletions(-)
 create mode 100644 Source/CPack/WiX/cmWIXPatchParser.cxx
 create mode 100644 Source/CPack/WiX/cmWIXPatchParser.h
 create mode 100644 Tests/CPackWiXGenerator/patch.xml


hooks/post-receive
-- 
CMake