[Cmake-commits] CMake branch, next, updated. v3.2.3-1487-gd6e9154

[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  d6e9154e368d61f355c897fd8d9374a416f01d78 (commit)
       via  10d3bf00fa084984dccd6ae6654dd1028969d150 (commit)
      from  7a802efbf4512c9038083a786be910078f058f7a (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=d6e9154e368d61f355c897fd8d9374a416f01d78
commit d6e9154e368d61f355c897fd8d9374a416f01d78
Merge: 7a802ef 10d3bf0
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Jun 4 11:57:40 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 4 11:57:40 2015 -0400

    Merge topic 'vs-deterministic-guid' into next
    
    10d3bf00 VS: Use cmUuid RFC 4122 compliant hash based UID generation


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10d3bf00fa084984dccd6ae6654dd1028969d150
commit 10d3bf00fa084984dccd6ae6654dd1028969d150
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Jun 4 15:48:03 2015 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Thu Jun 4 17:57:17 2015 +0200

    VS: Use cmUuid RFC 4122 compliant hash based UID generation

diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index a242046..0ced245 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -15,6 +15,7 @@
 #include "cmGeneratedFileStream.h"
 #include "cmLocalVisualStudio7Generator.h"
 #include "cmMakefile.h"
+#include "cmUuid.h"
 #include "cmake.h"
 #include <cmsys/Encoding.hxx>
 
@@ -953,14 +954,15 @@ std::string cmGlobalVisualStudio7Generator::GetGUID(std::string const& name)
   std::string input = this->CMakeInstance->GetState()->GetBinaryDirectory();
   input += "|";
   input += name;
-  std::string md5 = cmSystemTools::ComputeStringMD5(input);
-  assert(md5.length() == 32);
-  std::string const& guid =
-    (md5.substr( 0,8)+"-"+
-     md5.substr( 8,4)+"-"+
-     md5.substr(12,4)+"-"+
-     md5.substr(16,4)+"-"+
-     md5.substr(20,12));
+
+  cmUuid uuidGenerator;
+
+  std::vector<unsigned char> uuidNamespace;
+  uuidGenerator.StringToBinary(
+    "ee30c4be-5192-4fb0-b335-722a2dffe760", uuidNamespace);
+
+  std::string guid = uuidGenerator.FromMd5(uuidNamespace, input);
+
   return cmSystemTools::UpperCase(guid);
 }
 

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

Summary of changes:


hooks/post-receive
-- 
CMake