[Cmake-commits] CMake branch, master, updated. v3.7.0-rc3-481-gde53eb1
Brad King
brad.king at kitware.com
Thu Nov 10 08:34:33 EST 2016
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, master has been updated
via de53eb18ab48acbc6db6580473d1e83c73d59bc9 (commit)
via cd8a57ae9b4e7f811d30e1c5b225d36c7a049429 (commit)
via 71180fc8aa1db84260552f494578401e3ddb6a84 (commit)
via 3216e94cef3cd4afa558d9adef29921a9330935d (commit)
via 5420278dc884c0382f271872b67c33978f3fe6b8 (commit)
via 9a596b33bbfdb274ccf7f678c78cb8826c7c363b (commit)
via 47f91a6183a6bb65a423d5acb1b75c4b39c17a87 (commit)
via d0ff3e701c63caab5a44c48ac70e3ab75af9ee88 (commit)
via 465a85fb4615f4cfa20058c534bf3bfe71df1732 (commit)
via fc2cb74feedf2637e4b2cc153ede7b0726b9a7d3 (commit)
via 0bd333bc2eb6590f939ccabb7caf102f13443600 (commit)
via 7189d62c32e6f53dab5637f928917e59055f5e41 (commit)
via af7ebf8ad3b2b773dfe636a189a82998b1dc63e1 (commit)
via bb01f20e993bbd19b00e07ff0094b155aa0859de (commit)
via 31bb727f3b239b541e1ff5679b3c461e9a05f227 (commit)
via 53048afa8dc24327d82a1ff0f78801e1f344a4b6 (commit)
via 5cb1b345d932d3e0dc34a2d423894a59a6c8db35 (commit)
via 1367fccc330b0ff314845aeb3547bbc38486913a (commit)
via 798b0adc628ab16dbb4d04ef444b8e7db4f5cffa (commit)
from 25a76df17f72dcec494b88d2b59a54acbdee9798 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de53eb18ab48acbc6db6580473d1e83c73d59bc9
commit de53eb18ab48acbc6db6580473d1e83c73d59bc9
Merge: 25a76df cd8a57a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 08:34:28 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 10 08:34:28 2016 -0500
Merge topic 'import-librhash'
cd8a57ae Add option to build CMake against a system librhash
71180fc8 FindLibRHash: Add module to find the librhash package
3216e94c Remove unused cm_sha2 infrastructure
5420278d Port hash computation to cmCryptoHash
9a596b33 cmCryptoHash: Re-implement in terms of librhash
47f91a61 cmCryptoHash: Avoid using subclasses at client sites
d0ff3e70 librhash: Port to KWIML for ABI and integer type information
465a85fb librhash: Avoid signed left-shift overflow
fc2cb74f librhash: Implement bswap_32 as a function even in strict C90 mode
0bd333bc librhash: Implement bswap_64 even in strict C90 mode
7189d62c librhash: Use __builtin_bswap{32,64} on Clang
af7ebf8a librhash: Install COPYING file with CMake documentation
bb01f20e librhash: Disable warnings to avoid changing 3rd party code
31bb727f librhash: Build the library within CMake
53048afa librhash: Remove source fragments not needed for CMake
5cb1b345 Merge branch 'upstream-librhash' into import-librhash
...
diff --cc Source/cmGlobalGenerator.cxx
index 2d0767f,42e9df1..fa447ff
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@@ -44,10 -33,20 +44,10 @@@
#include "cmVersion.h"
#include "cmake.h"
-#include <algorithm>
-#include <assert.h>
-#include <cmsys/Directory.hxx>
-#include <cmsys/FStream.hxx>
-#include <iterator>
-#include <sstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
#if defined(CMAKE_BUILD_WITH_CMAKE)
+ #include "cmCryptoHash.h"
#include <cm_jsoncpp_value.h>
#include <cm_jsoncpp_writer.h>
- #include <cmsys/MD5.h>
#endif
class cmInstalledFile;
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 20 +-
CTestCustom.cmake.in | 2 -
Source/.gitattributes | 3 -
Source/CMakeLists.txt | 3 +-
Source/CPack/WiX/cmCPackWIXGenerator.cxx | 4 +-
Source/CTest/cmCTestLaunch.cxx | 15 +-
Source/Modules/FindLibRHash.cmake | 73 +
Source/cmCryptoHash.cxx | 97 +-
Source/cmCryptoHash.h | 61 +-
Source/cmFileCommand.cxx | 3 +-
Source/cmFilePathUuid.cxx | 4 +-
Source/cmGlobalGenerator.cxx | 13 +-
Source/cmLocalGenerator.cxx | 16 +-
Source/cmSystemTools.cxx | 6 +-
Source/cmUuid.cxx | 31 +-
Source/cm_sha2.c | 1613 -----------------------
Source/cm_sha2.h | 140 --
Source/cm_sha2_mangle.h | 42 -
Tests/CMakeLists.txt | 4 +
Tests/FindLibRHash/CMakeLists.txt | 10 +
Tests/FindLibRHash/Test/CMakeLists.txt | 17 +
Tests/FindLibRHash/Test/main.c | 7 +
Utilities/Scripts/clang-format.bash | 2 +-
Utilities/Scripts/update-librhash.bash | 43 +
Utilities/cmThirdParty.h.in | 1 +
Utilities/cm_rhash.h | 14 +
Utilities/{cmcurl => cmlibrhash}/.gitattributes | 0
Utilities/cmlibrhash/CMakeLists.txt | 38 +
Utilities/cmlibrhash/COPYING | 15 +
Utilities/cmlibrhash/README | 7 +
Utilities/cmlibrhash/librhash/algorithms.c | 220 ++++
Utilities/cmlibrhash/librhash/algorithms.h | 120 ++
Utilities/cmlibrhash/librhash/byte_order.c | 150 +++
Utilities/cmlibrhash/librhash/byte_order.h | 156 +++
Utilities/cmlibrhash/librhash/hex.c | 188 +++
Utilities/cmlibrhash/librhash/hex.h | 25 +
Utilities/cmlibrhash/librhash/md5.c | 236 ++++
Utilities/cmlibrhash/librhash/md5.h | 31 +
Utilities/cmlibrhash/librhash/rhash.c | 872 ++++++++++++
Utilities/cmlibrhash/librhash/rhash.h | 280 ++++
Utilities/cmlibrhash/librhash/sha1.c | 196 +++
Utilities/cmlibrhash/librhash/sha1.h | 31 +
Utilities/cmlibrhash/librhash/sha256.c | 241 ++++
Utilities/cmlibrhash/librhash/sha256.h | 32 +
Utilities/cmlibrhash/librhash/sha512.c | 255 ++++
Utilities/cmlibrhash/librhash/sha512.h | 32 +
Utilities/cmlibrhash/librhash/ustd.h | 39 +
Utilities/cmlibrhash/librhash/util.h | 31 +
bootstrap | 6 +-
49 files changed, 3495 insertions(+), 1950 deletions(-)
create mode 100644 Source/Modules/FindLibRHash.cmake
delete mode 100644 Source/cm_sha2.c
delete mode 100644 Source/cm_sha2.h
delete mode 100644 Source/cm_sha2_mangle.h
create mode 100644 Tests/FindLibRHash/CMakeLists.txt
create mode 100644 Tests/FindLibRHash/Test/CMakeLists.txt
create mode 100644 Tests/FindLibRHash/Test/main.c
create mode 100755 Utilities/Scripts/update-librhash.bash
create mode 100644 Utilities/cm_rhash.h
copy Utilities/{cmcurl => cmlibrhash}/.gitattributes (100%)
create mode 100644 Utilities/cmlibrhash/CMakeLists.txt
create mode 100644 Utilities/cmlibrhash/COPYING
create mode 100644 Utilities/cmlibrhash/README
create mode 100644 Utilities/cmlibrhash/librhash/algorithms.c
create mode 100644 Utilities/cmlibrhash/librhash/algorithms.h
create mode 100644 Utilities/cmlibrhash/librhash/byte_order.c
create mode 100644 Utilities/cmlibrhash/librhash/byte_order.h
create mode 100644 Utilities/cmlibrhash/librhash/hex.c
create mode 100644 Utilities/cmlibrhash/librhash/hex.h
create mode 100644 Utilities/cmlibrhash/librhash/md5.c
create mode 100644 Utilities/cmlibrhash/librhash/md5.h
create mode 100644 Utilities/cmlibrhash/librhash/rhash.c
create mode 100644 Utilities/cmlibrhash/librhash/rhash.h
create mode 100644 Utilities/cmlibrhash/librhash/sha1.c
create mode 100644 Utilities/cmlibrhash/librhash/sha1.h
create mode 100644 Utilities/cmlibrhash/librhash/sha256.c
create mode 100644 Utilities/cmlibrhash/librhash/sha256.h
create mode 100644 Utilities/cmlibrhash/librhash/sha512.c
create mode 100644 Utilities/cmlibrhash/librhash/sha512.h
create mode 100644 Utilities/cmlibrhash/librhash/ustd.h
create mode 100644 Utilities/cmlibrhash/librhash/util.h
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list