[Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-62-g6bd277d

[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  6bd277d2c15201962c2774d71f326a6918f56231 (commit)
       via  a12b0f1b193024b71583b9150aeead33d364d189 (commit)
      from  7540deb185a40ddfbac759f8027df74c2a8569c3 (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=6bd277d2c15201962c2774d71f326a6918f56231
commit 6bd277d2c15201962c2774d71f326a6918f56231
Merge: 7540deb a12b0f1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 10 08:49:33 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 10 08:49:33 2016 -0500

    Merge topic 'wix-prevent-nsis-overwrite'
    
    a12b0f1b CMake: Prevent WiX installations over existing NSIS installations


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

Summary of changes:
 CMakeCPack.cmake                                   |   11 +++++
 CMakeCPackOptions.cmake.in                         |   28 ++++++++++--
 Utilities/CMakeLists.txt                           |    4 ++
 Utilities/Release/WiX/CMakeLists.txt               |   12 ++++++
 Utilities/Release/WiX/CustomAction/CMakeLists.txt  |   13 ++++++
 .../WiX/CustomAction/detect_nsis_overwrite.cpp     |   45 ++++++++++++++++++++
 Utilities/Release/WiX/CustomAction/exports.def     |    2 +
 .../Release/WiX/cmake_nsis_overwrite_dialog.wxs    |   21 +++++++++
 Utilities/Release/WiX/custom_action_dll.wxs.in     |    6 +++
 Utilities/Release/WiX/install_dir.wxs              |   13 +++++-
 10 files changed, 151 insertions(+), 4 deletions(-)
 create mode 100644 Utilities/Release/WiX/CMakeLists.txt
 create mode 100644 Utilities/Release/WiX/CustomAction/CMakeLists.txt
 create mode 100644 Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp
 create mode 100644 Utilities/Release/WiX/CustomAction/exports.def
 create mode 100644 Utilities/Release/WiX/cmake_nsis_overwrite_dialog.wxs
 create mode 100644 Utilities/Release/WiX/custom_action_dll.wxs.in


hooks/post-receive
-- 
CMake