[Cmake-commits] CMake branch, next, updated. v3.3.1-2433-g7b03a6b

[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  7b03a6bd559fdfabf7bab274cb3f99f9bc212edc (commit)
       via  7a64f35d714da66a43a22e8501a2cec383e04025 (commit)
       via  1c9e979cb8839e59d5e33bb9dd0d3316ac7403ca (commit)
      from  50e7fa615cfcb63b337640d353fc153a74ac1fde (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=7b03a6bd559fdfabf7bab274cb3f99f9bc212edc
commit 7b03a6bd559fdfabf7bab274cb3f99f9bc212edc
Merge: 50e7fa6 7a64f35
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 25 09:46:31 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 25 09:46:31 2015 -0400

    Merge topic 'vs-store-phone-cert-thumbs' into next
    
    7a64f35d fixup! VS: Windows Store/Phone package cert thumbprint
    1c9e979c fixup! VS: Windows Store/Phone package cert thumbprint


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a64f35d714da66a43a22e8501a2cec383e04025
commit 7a64f35d714da66a43a22e8501a2cec383e04025
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 25 09:46:19 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 25 09:46:19 2015 -0400

    fixup! VS: Windows Store/Phone package cert thumbprint

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 3780ec0..583e1d0 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1041,7 +1041,7 @@ std::string cmSystemTools::ComputeCertificateThumbprint(
       certData = new BYTE[fileSize];
       if (certData != NULL)
         {
-        DWORD dwRead = NULL;
+        DWORD dwRead = 0;
         if (ReadFile(certFile, certData, fileSize, &dwRead, NULL))
           {
           cryptBlob.cbData = fileSize;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c9e979cb8839e59d5e33bb9dd0d3316ac7403ca
commit 1c9e979cb8839e59d5e33bb9dd0d3316ac7403ca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 25 09:21:04 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 25 09:21:04 2015 -0400

    fixup! VS: Windows Store/Phone package cert thumbprint

diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index f29ac70..d3cff51 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -32,6 +32,7 @@ set(CTEST_CUSTOM_WARNING_EXCEPTION
   "remark: .*LOOP WAS VECTORIZED"
   "warning .980: wrong number of actual arguments to intrinsic function .std::basic_"
   "LINK : warning LNK4089: all references to.*ADVAPI32.dll.*discarded by /OPT:REF"
+  "LINK : warning LNK4089: all references to.*CRYPT32.dll.*discarded by /OPT:REF"
   "LINK : warning LNK4089: all references to.*PSAPI.DLL.*discarded by /OPT:REF"
   "LINK : warning LNK4089: all references to.*RPCRT4.dll.*discarded by /OPT:REF"
   "LINK : warning LNK4089: all references to.*SHELL32.dll.*discarded by /OPT:REF"

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

Summary of changes:
 CTestCustom.cmake.in     |    1 +
 Source/cmSystemTools.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake