diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-09-01 18:59:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-09-03 12:04:56 (GMT) |
| commit | efed6468eda950644014ccfada85300710e05009 (patch) | |
| tree | 34373674a96941d95ee8443e34936ff66da8f56a /Source/cmCurl.cxx | |
| parent | bd3d0eafbb362fbc0f140c228da85791a473e44e (diff) | |
| download | CMake-efed6468eda950644014ccfada85300710e05009.zip CMake-efed6468eda950644014ccfada85300710e05009.tar.gz CMake-efed6468eda950644014ccfada85300710e05009.tar.bz2 | |
fix a load of include-what-you-use violations
Diffstat (limited to 'Source/cmCurl.cxx')
| -rw-r--r-- | Source/cmCurl.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx index 5bc4f91..eec773f 100644 --- a/Source/cmCurl.cxx +++ b/Source/cmCurl.cxx @@ -11,7 +11,13 @@ ============================================================================*/ #include "cmCurl.h" +#include "cmThirdParty.h" + +#if !defined(CMAKE_USE_SYSTEM_CURL) && !defined(_WIN32) && \ + !defined(__APPLE__) && !defined(CURL_CA_BUNDLE) && !defined(CURL_CA_PATH) +#define CMAKE_FIND_CAFILE #include "cmSystemTools.h" +#endif // curl versions before 7.21.5 did not provide this error code #if defined(LIBCURL_VERSION_NUM) && LIBCURL_VERSION_NUM < 0x071505 @@ -32,8 +38,7 @@ std::string cmCurlSetCAInfo(::CURL* curl, const char* cafile) ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile); check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); } -#if !defined(CMAKE_USE_SYSTEM_CURL) && !defined(_WIN32) && \ - !defined(__APPLE__) && !defined(CURL_CA_BUNDLE) && !defined(CURL_CA_PATH) +#ifdef CMAKE_FIND_CAFILE #define CMAKE_CAFILE_FEDORA "/etc/pki/tls/certs/ca-bundle.crt" else if (cmSystemTools::FileExists(CMAKE_CAFILE_FEDORA, true)) { ::CURLcode res = |