[Cmake-commits] CMake branch, next, updated. v3.3.1-2701-gd1d01e4

[Brad King]

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  d1d01e4adcb36b23a37489a5d6a940f4536aa4dc (commit)
       via  7c33b0f9a6d648659a66d71263e7b0b631bce01a (commit)
      from  f552aedf2f3d8aba1e8123e5adce58ca15078a56 (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=d1d01e4adcb36b23a37489a5d6a940f4536aa4dc
commit d1d01e4adcb36b23a37489a5d6a940f4536aa4dc
Merge: f552aed 7c33b0f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 2 09:24:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 2 09:24:50 2015 -0400

    Merge topic 'vs-store-phone-cert-thumbs' into next
    
    7c33b0f9 cmSystemTools: Skip ComputeCertificateThumbprint during bootstrap


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c33b0f9a6d648659a66d71263e7b0b631bce01a
commit 7c33b0f9a6d648659a66d71263e7b0b631bce01a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 2 09:23:32 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 2 09:23:45 2015 -0400

    cmSystemTools: Skip ComputeCertificateThumbprint during bootstrap
    
    The implementation of this method requires linking to some extra system
    libraries.  Simply leave it out of the bootstrap-built CMake.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 0cbe15c..545e552 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1019,7 +1019,7 @@ std::string cmSystemTools::ComputeCertificateThumbprint(
 {
   std::string thumbprint;
 
-#ifdef _WIN32
+#if defined(CMAKE_BUILD_WITH_CMAKE) && defined(_WIN32)
   BYTE* certData = NULL;
   CRYPT_INTEGER_BLOB cryptBlob;
   HCERTSTORE certStore = NULL;

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

Summary of changes:
 Source/cmSystemTools.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake