diff options
| author | Brad King <brad.king@kitware.com> | 2016-02-10 13:49:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-02-10 13:49:30 (GMT) |
| commit | 7540deb185a40ddfbac759f8027df74c2a8569c3 (patch) | |
| tree | 3c6a9f5da4d4e4f32d34d5fc69e0d58ed8e02014 /Source | |
| parent | 0def7e6e70d809958cb605e93dbe3d02baf05265 (diff) | |
| parent | 1ea55acf8aaa1a59b4453e4aec1fc704d7696321 (diff) | |
| download | CMake-7540deb185a40ddfbac759f8027df74c2a8569c3.zip CMake-7540deb185a40ddfbac759f8027df74c2a8569c3.tar.gz CMake-7540deb185a40ddfbac759f8027df74c2a8569c3.tar.bz2 | |
Merge topic 'curl-pre-7.21.5'
1ea55acf cmCurl: Fix compilation with system curl versions prior to 7.21.5
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCurl.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
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) \ { \ |