summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-02-09 13:26:50 -0500
committerBrad King <brad.king@kitware.com>2016-02-09 13:26:50 -0500
commitb162dd9ea0c7c08b4b5c0afcb107ebf870064ee2 (patch)
tree161974d7ae9482ad9e2c12accd71fb458f71470e
parent5b06896ba85f20d621b052c75930e671fc3c37fa (diff)
parent1ea55acf8aaa1a59b4453e4aec1fc704d7696321 (diff)
downloadcmake-b162dd9ea0c7c08b4b5c0afcb107ebf870064ee2.tar.gz
Merge branch 'curl-pre-7.21.5' into release
-rw-r--r--Source/cmCurl.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
index ad0c7d3e2d..4f3d89083f 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) \
{ \