[Cmake-commits] CMake branch, master, updated. v2.8.10.2-287-g2bb2745

[David Cole]

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  2bb2745fa8c260d12aca33d2e1fd26a92d3bfa6b (commit)
       via  a74bd470a4d01cfa06710d039bb435b02682ac3f (commit)
       via  ad0f73573fcc59c7c428ef5e529f8fec6a1cfbe6 (commit)
       via  0729ad476c94e2e8918e5fa9718a9173f8199e02 (commit)
       via  85baac1503c638756211ba07c4c25128e6d3d845 (commit)
      from  799befa21535c828e22b2fce3c472ea2f1eabd3c (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=2bb2745fa8c260d12aca33d2e1fd26a92d3bfa6b
commit 2bb2745fa8c260d12aca33d2e1fd26a92d3bfa6b
Merge: 799befa a74bd47
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Dec 5 10:31:05 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 5 10:31:05 2012 -0500

    Merge topic 'fix-11575-add-wix-support-to-cpack'
    
    a74bd47 CPack: Fix dashboard errors and warnings (#11575)
    ad0f735 CPack: Fix dashboard warnings (#11575)
    0729ad4 CPack: Fix dashboard errors (#11575)
    85baac1 CPack: Add a WiX Generator (#11575)


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

Summary of changes:
 CMakeCPackOptions.cmake.in                         |   24 +
 Modules/CPack.cmake                                |    7 +-
 Modules/CPackWIX.cmake                             |   83 +++
 Modules/WIX.template.in                            |   31 ++
 Source/CMakeLists.txt                              |    8 +
 Source/CPack/WiX/cmCPackWIXGenerator.cxx           |  568 ++++++++++++++++++++
 Source/CPack/WiX/cmCPackWIXGenerator.h             |  101 ++++
 Source/CPack/WiX/cmWIXRichTextFormatWriter.cxx     |  137 +++++
 Source/CPack/WiX/cmWIXRichTextFormatWriter.h       |   46 ++
 Source/CPack/WiX/cmWIXSourceWriter.cxx             |  189 +++++++
 Source/CPack/WiX/cmWIXSourceWriter.h               |   67 +++
 Source/CPack/cmCPackGeneratorFactory.cxx           |   11 +
 Tests/CMakeLists.txt                               |   23 +
 Tests/CPackWiXGenerator/CMakeLists.txt             |   73 +++
 Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake |   72 +++
 .../CPackWiXGenerator/file with spaces.h           |    0
 .../mylib.cpp                                      |    0
 .../{CPackComponents => CPackWiXGenerator}/mylib.h |    0
 .../mylibapp.cpp                                   |    0
 19 files changed, 1439 insertions(+), 1 deletions(-)
 create mode 100644 Modules/CPackWIX.cmake
 create mode 100644 Modules/WIX.template.in
 create mode 100644 Source/CPack/WiX/cmCPackWIXGenerator.cxx
 create mode 100644 Source/CPack/WiX/cmCPackWIXGenerator.h
 create mode 100644 Source/CPack/WiX/cmWIXRichTextFormatWriter.cxx
 create mode 100644 Source/CPack/WiX/cmWIXRichTextFormatWriter.h
 create mode 100644 Source/CPack/WiX/cmWIXSourceWriter.cxx
 create mode 100644 Source/CPack/WiX/cmWIXSourceWriter.h
 create mode 100644 Tests/CPackWiXGenerator/CMakeLists.txt
 create mode 100644 Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/CPackWiXGenerator/file with spaces.h (100%)
 copy Tests/{CPackComponents => CPackWiXGenerator}/mylib.cpp (100%)
 copy Tests/{CPackComponents => CPackWiXGenerator}/mylib.h (100%)
 copy Tests/{CPackComponents => CPackWiXGenerator}/mylibapp.cpp (100%)


hooks/post-receive
-- 
CMake