[Cmake-commits] CMake branch, next, updated. v3.6.1-1696-gda6f1e4

[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  da6f1e440ef5804656ff085761233d6208bb613a (commit)
       via  0bacb0f108a2e2b0670d5a17c031cb75b8d09428 (commit)
      from  4db1df2da06cfa05b1f26546ca7deba40477b4e6 (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=da6f1e440ef5804656ff085761233d6208bb613a
commit da6f1e440ef5804656ff085761233d6208bb613a
Merge: 4db1df2 0bacb0f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 1 15:56:30 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 1 15:56:30 2016 -0400

    Merge topic 'include-what-you-use' into next
    
    0bacb0f1 fixup! fix a load of include-what-you-use violations


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bacb0f108a2e2b0670d5a17c031cb75b8d09428
commit 0bacb0f108a2e2b0670d5a17c031cb75b8d09428
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 1 15:55:49 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 1 15:55:49 2016 -0400

    fixup! fix a load of include-what-you-use violations

diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
index 94d487e..eec773f 100644
--- a/Source/cmCurl.cxx
+++ b/Source/cmCurl.cxx
@@ -13,6 +13,12 @@
 
 #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
 #define CURLE_NOT_BUILT_IN 4
@@ -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 =

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

Summary of changes:
 Source/cmCurl.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake