[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1187-g62db66b

[David Cole]

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  62db66b7253ad8adce8c61c7c62cbf6a41323751 (commit)
       via  0729ad476c94e2e8918e5fa9718a9173f8199e02 (commit)
      from  27334cf954e87ed2df3b6f2f72a3d6c8b80e8701 (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=62db66b7253ad8adce8c61c7c62cbf6a41323751
commit 62db66b7253ad8adce8c61c7c62cbf6a41323751
Merge: 27334cf 0729ad4
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Dec 3 13:18:02 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 3 13:18:02 2012 -0500

    Merge topic 'fix-11575-add-wix-support-to-cpack' into next
    
    0729ad4 CPack: Fix dashboard errors (#11575)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0729ad476c94e2e8918e5fa9718a9173f8199e02
commit 0729ad476c94e2e8918e5fa9718a9173f8199e02
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Mon Dec 3 13:16:35 2012 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Mon Dec 3 13:16:35 2012 -0500

    CPack: Fix dashboard errors (#11575)
    
    Use same technique here with UuidToString as already found in
    cmGlobalVisualStudio7Generator::CreateGUID to avoid using a type
    that is not defined on older systems... (VS 7.0 and Borland)

diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 6e8c5ea..68ca60e 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -539,8 +539,8 @@ std::string cmCPackWIXGenerator::GenerateGUID()
   UUID guid;
   UuidCreate(&guid);
 
-  RPC_CSTR tmp = 0;
-  UuidToStringA(&guid, &tmp);
+  unsigned char *tmp = 0;
+  UuidToString(&guid, &tmp);
 
   std::string result(reinterpret_cast<char*>(tmp));
   RpcStringFree(&tmp);

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

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


hooks/post-receive
-- 
CMake