[Cmake-commits] CMake branch, next, updated. v3.2.3-1481-gf8845e5

[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  f8845e56f4b494189403bead9186257e84b99969 (commit)
       via  d9077d198e9cd0efdaea3a140cb7d5ab9ca833e5 (commit)
      from  3f4567550c1bd7db5b55773be46a1f08de19fbb8 (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=f8845e56f4b494189403bead9186257e84b99969
commit f8845e56f4b494189403bead9186257e84b99969
Merge: 3f45675 d9077d1
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Thu Jun 4 10:01:12 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 4 10:01:12 2015 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9077d198e9cd0efdaea3a140cb7d5ab9ca833e5
commit d9077d198e9cd0efdaea3a140cb7d5ab9ca833e5
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 15:48:03 2015 +0200

    VS: Use cmUuid RFC 4122 compliant hash based UID generation

diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index a242046..35760d7 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;
+  assert(uuidGenerator.StringToBinary(
+    "ee30c4be-5192-4fb0-b335-722a2dffe760", uuidNamespace));
+
+  std::string guid = uuidGenerator.FromMd5(uuidNamespace, input);
+
   return cmSystemTools::UpperCase(guid);
 }
 

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

Summary of changes:
 Source/cmGlobalVisualStudio7Generator.cxx |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake