[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6295-g13732b7

[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  13732b7a1a04ecf08f1fb5efbe0bf38c0cae080e (commit)
       via  7eea71ea57b773244095c54cc5fdde5af93b829c (commit)
       via  a0ce1e36b6d3a117ebf51d1d803a129cf657321e (commit)
      from  742ee0ed00ca7d3203e26bea735ed34e3403e39c (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=13732b7a1a04ecf08f1fb5efbe0bf38c0cae080e
commit 13732b7a1a04ecf08f1fb5efbe0bf38c0cae080e
Merge: 742ee0e 7eea71e
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Dec 20 06:02:22 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 20 06:02:22 2013 -0500

    Merge topic 'wix-fix-registry-slash' into next
    
    7eea71e CPackWiX: replace slash with backslash in registry key path
    a0ce1e3 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7eea71ea57b773244095c54cc5fdde5af93b829c
commit 7eea71ea57b773244095c54cc5fdde5af93b829c
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Dec 20 12:01:28 2013 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Dec 20 12:01:28 2013 +0100

    CPackWiX: replace slash with backslash in registry key path
    
    Forward slash is not understood as a key path separator.

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 6f1daaa..f892cf9 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -765,7 +765,7 @@ bool cmCPackWIXGenerator::CreateStartMenuShortcuts(
   fileDefinitions.EndElement("RemoveFolder");
 
   std::string registryKey =
-    std::string("Software/") + cpackVendor + "/" + cpackPackageName;
+    std::string("Software\\") + cpackVendor + "\\" + cpackPackageName;
 
   fileDefinitions.BeginElement("RegistryValue");
   fileDefinitions.AddAttribute("Root", "HKCU");

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

Summary of changes:
 Source/CMakeVersion.cmake                |    2 +-
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake