[Cmake-commits] CMake branch, master, updated. v3.2.0-rc1-268-gcb16c78

[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  cb16c7844dce627ab40f404c6ac49db3cde7b0c0 (commit)
       via  6cc01c140245749bb6a6d5096b4a38f3f16fb776 (commit)
       via  135febf069e7ff5305a3729b81171933ec89dc90 (commit)
       via  e6731f486e466ddd58550851fb935dbda7939cac (commit)
       via  279605f560312aab4dfeef4cce1c8c67d4083b4e (commit)
       via  53d7dafface62d40ea795456394f7ab1d5ee6712 (commit)
       via  dc0f3fb44fb9384438ece513c12d83a36e385802 (commit)
      from  7cebc5acacc14e0d4c9416735c86c5870671f173 (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=cb16c7844dce627ab40f404c6ac49db3cde7b0c0
commit cb16c7844dce627ab40f404c6ac49db3cde7b0c0
Merge: 7cebc5a 6cc01c1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 23 11:06:07 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 11:06:07 2015 -0500

    Merge topic 'wix-shortcut-properties'
    
    6cc01c14 CPackWIX: Add release notes for the wix-shortcut-properties topic.
    135febf0 CPackWIX: Enhance CMake CPack WIX generated installer.
    e6731f48 CPackWIX: Add new CPACK_STARTUP_SHORTCUTS property.
    279605f5 CPackWIX: Add installed file properties for the creation of shortcuts.
    53d7daff CPackWIX: Refactor start menu and desktop shortcut creation.
    dc0f3fb4 CPackWIX: Explicitly list CPack WIX headers for IDE convenience.


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

Summary of changes:
 CMakeCPackOptions.cmake.in                        |   22 +++
 Help/manual/cmake-properties.7.rst                |    3 +
 Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst        |    7 +
 Help/prop_inst/CPACK_STARTUP_SHORTCUTS.rst        |    7 +
 Help/prop_inst/CPACK_START_MENU_SHORTCUTS.rst     |    7 +
 Help/release/dev/wix-shortcut-properties.rst      |    9 +
 Source/CMakeLists.txt                             |   11 ++
 Source/CPack/WiX/cmCPackWIXGenerator.cxx          |  216 ++++++++++++---------
 Source/CPack/WiX/cmCPackWIXGenerator.h            |   26 ++-
 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx |    8 +
 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h   |    2 +
 Source/CPack/WiX/cmWIXFilesSourceWriter.cxx       |   36 +---
 Source/CPack/WiX/cmWIXFilesSourceWriter.h         |   20 +-
 Source/CPack/WiX/cmWIXShortcut.cxx                |  125 ++++++++++++
 Source/CPack/WiX/cmWIXShortcut.h                  |   62 +++++-
 15 files changed, 409 insertions(+), 152 deletions(-)
 create mode 100644 Help/prop_inst/CPACK_DESKTOP_SHORTCUTS.rst
 create mode 100644 Help/prop_inst/CPACK_STARTUP_SHORTCUTS.rst
 create mode 100644 Help/prop_inst/CPACK_START_MENU_SHORTCUTS.rst
 create mode 100644 Help/release/dev/wix-shortcut-properties.rst
 create mode 100644 Source/CPack/WiX/cmWIXShortcut.cxx


hooks/post-receive
-- 
CMake