[Cmake-commits] CMake branch, next, updated. v3.0.2-5391-gf7829f4

[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  f7829f46855d14b86fc74fb2988b4cb386ab2428 (commit)
       via  e785fab54b17349f01bc791d808de3319a30d95a (commit)
      from  04aed0b7c46aa0c884e714c60ef25261d072d384 (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=f7829f46855d14b86fc74fb2988b4cb386ab2428
commit f7829f46855d14b86fc74fb2988b4cb386ab2428
Merge: 04aed0b e785fab
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Sep 19 16:43:32 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 19 16:43:32 2014 -0400

    Merge topic 'wix-remember-install-dir' into next
    
    e785fab5 CPackWiX: Teach WiX installers to remember the install location for upgrades


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e785fab54b17349f01bc791d808de3319a30d95a
commit e785fab54b17349f01bc791d808de3319a30d95a
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Sep 19 22:42:36 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Sep 19 22:42:36 2014 +0200

    CPackWiX: Teach WiX installers to remember the install location for upgrades

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index a2995d1..b221ab4 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -360,6 +360,29 @@ void cmCPackWIXGenerator::CreateWiXPropertiesIncludeFile()
       includeFile.EndElement("Property");
       }
     }
+
+  if(GetOption("CPACK_WIX_PROPERTY_ARPINSTALLLOCATION") == 0)
+    {
+    includeFile.BeginElement("Property");
+    includeFile.AddAttribute("Id", "INSTALL_ROOT");
+    includeFile.AddAttribute("Secure", "yes");
+
+    includeFile.BeginElement("RegistrySearch");
+    includeFile.AddAttribute("Id", "FindInstallLocation");
+    includeFile.AddAttribute("Root", "HKLM");
+    includeFile.AddAttribute("Key", "Software\\Microsoft\\Windows\\"
+      "CurrentVersion\\Uninstall\\[WIX_UPGRADE_DETECTED]");
+    includeFile.AddAttribute("Name", "InstallLocation");
+    includeFile.AddAttribute("Type", "raw");
+    includeFile.EndElement("RegistrySearch");
+    includeFile.EndElement("Property");
+
+    includeFile.BeginElement("SetProperty");
+    includeFile.AddAttribute("Id", "ARPINSTALLLOCATION");
+    includeFile.AddAttribute("Value", "[INSTALL_ROOT]");
+    includeFile.AddAttribute("After", "CostFinalize");
+    includeFile.EndElement("SetProperty");
+    }
 }
 
 void cmCPackWIXGenerator::CopyDefinition(

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

Summary of changes:
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)


hooks/post-receive
-- 
CMake