[Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-99-g57d546c

[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  57d546cf95daa5b5187d47697b9476feca4a146d (commit)
       via  1ea55acf8aaa1a59b4453e4aec1fc704d7696321 (commit)
      from  236133f1fb460880cb87c7ed48f2be81bd197cb2 (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=57d546cf95daa5b5187d47697b9476feca4a146d
commit 57d546cf95daa5b5187d47697b9476feca4a146d
Merge: 236133f 1ea55ac
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 9 13:25:30 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 9 13:25:30 2016 -0500

    Merge topic 'curl-pre-7.21.5' into next
    
    1ea55acf cmCurl: Fix compilation with system curl versions prior to 7.21.5


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ea55acf8aaa1a59b4453e4aec1fc704d7696321
commit 1ea55acf8aaa1a59b4453e4aec1fc704d7696321
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 9 13:20:39 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 9 13:24:19 2016 -0500

    cmCurl: Fix compilation with system curl versions prior to 7.21.5
    
    This version introduced CURLE_NOT_BUILT_IN which we have used since
    commit v3.4.0-rc1~211^2~4 (cmCurl: Tolerate lack of CURLOPT_CAPATH
    support, 2015-08-12).  For older versions, just define the name to the
    then-unused error code so that we can compile.

diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
index ad0c7d3..4f3d890 100644
--- a/Source/cmCurl.cxx
+++ b/Source/cmCurl.cxx
@@ -12,6 +12,11 @@
 #include "cmCurl.h"
 #include "cmSystemTools.h"
 
+// curl versions before 7.21.5 did not provide this error code
+#if defined(LIBCURL_VERSION_NUM) && LIBCURL_VERSION_NUM < 0x071505
+# define CURLE_NOT_BUILT_IN 4
+#endif
+
 #define check_curl_result(result, errstr)                               \
   if (result != CURLE_OK && result != CURLE_NOT_BUILT_IN)               \
     {                                                                   \

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

Summary of changes:
 Source/cmCurl.cxx |    5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
CMake