diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-17 14:24:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-17 14:24:49 (GMT) |
| commit | 89b483f2b6f136509168ea4764072bae119ef618 (patch) | |
| tree | a38a6c01c23a2701f50687447190328ee1a402d5 /Source | |
| parent | da3b62cffd5a33a23d963beecc92305055c1bfee (diff) | |
| parent | 4071a7470723f98eac1e5f412f1d1bc27c882a36 (diff) | |
| download | CMake-89b483f2b6f136509168ea4764072bae119ef618.zip CMake-89b483f2b6f136509168ea4764072bae119ef618.tar.gz CMake-89b483f2b6f136509168ea4764072bae119ef618.tar.bz2 | |
Merge topic 'update-curl'
4071a747 curl: Update README-CMake.txt for new snapshot
7727d485 curl: Update configuration of build within CMake
3f2f1a94 curl: Fix check for gethostbyname_r with 5 arguments
91e8d35a Merge branch 'curl-upstream' into update-curl
602cdc06 cmCurl: Tolerate lack of CURLOPT_CAPATH support
70654261 curl 7.44.0 (reduced)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCurl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx index 96d3547..ad0c7d3 100644 --- a/Source/cmCurl.cxx +++ b/Source/cmCurl.cxx @@ -13,7 +13,7 @@ #include "cmSystemTools.h" #define check_curl_result(result, errstr) \ - if (result != CURLE_OK) \ + if (result != CURLE_OK && result != CURLE_NOT_BUILT_IN) \ { \ e += e.empty()? "" : "\n"; \ e += errstr; \ |