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 1337576b24feef973fca7cc45c695b495b3f8a5e (commit)
via 0abd3e538eb92259e52c3d330e46dac7aa0be332 (commit)
via 6ce346c53c67ba970cd04f0d8436aab006dbec71 (commit)
from e71c35ff26df370121871dc7cc7fe9b585dac570 (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=1337576b24feef973fca7cc45c695b495b3f8a5e
commit 1337576b24feef973fca7cc45c695b495b3f8a5e
Merge: e71c35f 0abd3e5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jan 26 09:51:50 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jan 26 09:51:50 2015 -0500
Merge topic 'curl-default-cainfo'
0abd3e53 cmake: Use a default CA path when not using system curl
6ce346c5 curl: Add CURL_CA_PATH option to CMake build process
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 7 +++
Help/release/dev/curl-default-cainfo.rst | 8 +++
Source/CMakeLists.txt | 8 +++
Source/CTest/cmCTestSubmitHandler.cxx | 3 +-
Source/cmCTest.cxx | 3 +-
Source/cmCurl.cxx | 64 +++++++++++++++++++++++
Utilities/cm_jsoncpp_value.h => Source/cmCurl.h | 16 +++---
Source/cmFileCommand.cxx | 9 ++--
Utilities/cmcurl/CMakeLists.txt | 9 ++--
Utilities/cmcurl/lib/curl_config.h.cmake | 6 ---
10 files changed, 107 insertions(+), 26 deletions(-)
create mode 100644 Help/release/dev/curl-default-cainfo.rst
create mode 100644 Source/cmCurl.cxx
copy Utilities/cm_jsoncpp_value.h => Source/cmCurl.h (70%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
