[Cmake-commits] CMake branch, next, updated. v3.4.1-1757-g45b017a

[Nils Gladitz]

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, next has been updated
       via  45b017abd486a576137b01d41cef654f78721b9c (commit)
       via  69873d4a4434d4be2261f23f99ff4f0bffae60e4 (commit)
      from  7a9f867254c923cba334c73e5cbf512e2ae64419 (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=45b017abd486a576137b01d41cef654f78721b9c
commit 45b017abd486a576137b01d41cef654f78721b9c
Merge: 7a9f867 69873d4
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Dec 17 09:57:11 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 17 09:57:11 2015 -0500

    Merge topic 'release-wix-config-ng' into next
    
    69873d4a CMake: !fixup perform per machine WiX installations


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=69873d4a4434d4be2261f23f99ff4f0bffae60e4
commit 69873d4a4434d4be2261f23f99ff4f0bffae60e4
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Dec 17 15:56:23 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Thu Dec 17 15:56:23 2015 +0100

    CMake: !fixup perform per machine WiX installations

diff --git a/Utilities/Release/WiX/WIX.template.in b/Utilities/Release/WiX/WIX.template.in
index 8f10f61..094999f 100644
--- a/Utilities/Release/WiX/WIX.template.in
+++ b/Utilities/Release/WiX/WIX.template.in
@@ -12,7 +12,7 @@
         Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
         UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)">
 
-        <Package InstallerVersion="301" Compressed="yes"/>
+        <Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine"/>
 
         <Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/>
 

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

Summary of changes:
 Utilities/Release/WiX/WIX.template.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake