[Cmake-commits] CMake branch, next, updated. v3.2.3-1516-g03230b4

[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  03230b4b5cf33762774ee425373d03940225658d (commit)
       via  cdf2cba3e71b92c5bddf7afe760c131953f999a4 (commit)
      from  581b046dcfc911310c1f211254b794d7569625a4 (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=03230b4b5cf33762774ee425373d03940225658d
commit 03230b4b5cf33762774ee425373d03940225658d
Merge: 581b046 cdf2cba
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Jun 5 03:18:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 5 03:18:48 2015 -0400

    Merge topic 'vs-deterministic-guid' into next
    
    cdf2cba3 VS: Use cmUuid RFC 4122 compliant hash based UUID generation


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

    VS: Use cmUuid RFC 4122 compliant hash based UUID 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