[Cmake-commits] CMake branch, next, updated. v3.3.1-2235-geef231c
Brad King
brad.king at kitware.com
Mon Aug 17 10:18:24 EDT 2015
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 eef231cab61ba3511d7c2b6d63b5de9003c8ee78 (commit)
via 4071a7470723f98eac1e5f412f1d1bc27c882a36 (commit)
via 7727d485d39cdc63539d5645b4e977109ca1ffed (commit)
via 3f2f1a949c5e262ba7cb6d2d3eaaaf67394b6fdf (commit)
from 61a0fe4648d7e2c65c1fb62641f6c6e3dea2afb3 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eef231cab61ba3511d7c2b6d63b5de9003c8ee78
commit eef231cab61ba3511d7c2b6d63b5de9003c8ee78
Merge: 61a0fe4 4071a74
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 17 10:18:23 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 17 10:18:23 2015 -0400
Merge topic 'update-curl' into next
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
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4071a7470723f98eac1e5f412f1d1bc27c882a36
commit 4071a7470723f98eac1e5f412f1d1bc27c882a36
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 12 15:05:28 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 17 10:17:51 2015 -0400
curl: Update README-CMake.txt for new snapshot
diff --git a/Utilities/cmcurl/README-CMake.txt b/Utilities/cmcurl/README-CMake.txt
index 3f053d8..1e75672 100644
--- a/Utilities/cmcurl/README-CMake.txt
+++ b/Utilities/cmcurl/README-CMake.txt
@@ -11,7 +11,7 @@ branch, but it is merged into our history.
Update curl from upstream as follows. Create a local branch to
explicitly reference the upstream snapshot branch head:
- git branch curl-upstream 3fe5d9bf
+ git branch curl-upstream 70654261
Use a temporary directory to checkout the branch:
@@ -24,7 +24,7 @@ Use a temporary directory to checkout the branch:
Now place the (reduced) curl content in this directory. See
instructions shown by
- git log 3fe5d9bf
+ git log 70654261
for help extracting the content from the upstream repo. Then run
the following commands to commit the new version. Substitute the
@@ -34,8 +34,8 @@ appropriate date and version number:
GIT_AUTHOR_NAME='Curl Upstream' \
GIT_AUTHOR_EMAIL='curl-library at cool.haxx.se' \
- GIT_AUTHOR_DATE='Wed Sep 10 08:07:58 2014 +0200' \
- git commit -m 'curl 7.38.0 (reduced)' &&
+ GIT_AUTHOR_DATE='Tue Aug 11 20:13:01 2015 +0200' \
+ git commit -m 'curl 7.44.0 (reduced)' &&
git commit --amend
Edit the commit message to describe the procedure used to obtain the
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7727d485d39cdc63539d5645b4e977109ca1ffed
commit 7727d485d39cdc63539d5645b4e977109ca1ffed
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 12 15:04:21 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 17 10:17:51 2015 -0400
curl: Update configuration of build within CMake
Update our curl build option settings as needed for CMake to account for
differences in curl options from 7.38 to 7.44.
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 6b01be9..d12c73f 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -3,6 +3,7 @@ set(BUILD_CURL_EXE OFF CACHE INTERNAL "No curl exe")
set(BUILD_CURL_TESTS OFF CACHE INTERNAL "No curl tests")
set(BUILD_DASHBOARD_REPORTS OFF CACHE INTERNAL "No curl dashboard reports")
set(BUILD_RELEASE_DEBUG_DIRS OFF CACHE INTERNAL "No curl release/debug dirs")
+set(CMAKE_USE_GSSAPI OFF CACHE INTERNAL "Disable curl gssapi")
set(CMAKE_USE_LIBSSH2 OFF CACHE INTERNAL "Disable curl libssh2")
set(CMAKE_USE_OPENLDAP OFF CACHE INTERNAL "No curl OpenLDAP")
set(CURL_DISABLE_COOKIES OFF CACHE INTERNAL "Do not disable curl cookie support")
@@ -16,18 +17,24 @@ set(CURL_DISABLE_IMAP ON CACHE INTERNAL "Disable curl imap protocol?")
set(CURL_DISABLE_LDAP ON CACHE INTERNAL "Disable curl ldap protocol?")
set(CURL_DISABLE_LDAPS ON CACHE INTERNAL "Disable curl ldaps protocol?")
set(CURL_DISABLE_POP3 ON CACHE INTERNAL "Disable curl pop3 protocol?")
+set(CURL_DISABLE_PROXY OFF CACHE INTERNAL "Do not disable curl proxy")
set(CURL_DISABLE_RTSP ON CACHE INTERNAL "Disable curl rtsp protocol?")
set(CURL_DISABLE_SMTP ON CACHE INTERNAL "Disable curl smtp protocol?")
set(CURL_DISABLE_TELNET ON CACHE INTERNAL "Disable curl telnet protocol?")
set(CURL_DISABLE_TFTP ON CACHE INTERNAL "Disable curl tftp protocol?")
-set(CURL_DISABLE_VERBOSE_STRING OFF CACHE INTERNAL "Do not disable curl verbosity")
+set(CURL_DISABLE_VERBOSE_STRINGS OFF CACHE INTERNAL "Do not disable curl verbosity")
set(CURL_HIDDEN_SYMBOLS OFF CACHE INTERNAL "No curl hidden symbols")
-set(CURL_LDAP_WIN OFF CACHE INTERNAL "No curl Windows LDAP")
set(CURL_STATICLIB ON CACHE INTERNAL "Static curl")
-set(CURL_USE_ARES OFF CACHE INTERNAL "No curl c-ares support")
set(DISABLED_THREADSAFE OFF CACHE INTERNAL "Curl can use thread-safe functions")
-set(ENABLE_IPV6 OFF CACHE INTERNAL "Curl IPv6 support")
+set(ENABLE_ARES OFF CACHE INTERNAL "No curl c-ares support")
+set(ENABLE_CURLDEBUG OFF CACHE INTERNAL "No curl TrackMemory features")
+set(ENABLE_DEBUG OFF CACHE INTERNAL "No curl debug features")
+set(ENABLE_IPV6 OFF CACHE INTERNAL "No curl IPv6 support")
+set(ENABLE_MANUAL OFF CACHE INTERNAL "No curl built-in manual")
+set(ENABLE_THREADED_RESOLVER OFF CACHE INTERNAL "No curl POSIX threaded DNS lookup")
+set(ENABLE_UNIX_SOCKETS OFF CACHE INTERNAL "No curl Unix domain sockets support")
set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only")
+set(USE_WIN32_LDAP OFF CACHE INTERNAL "No curl Windows LDAP")
# Windows Vista and above have inet_pton, but this will link on
# older versions and then the executable will fail to launch at
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f2f1a949c5e262ba7cb6d2d3eaaaf67394b6fdf
commit 3f2f1a949c5e262ba7cb6d2d3eaaaf67394b6fdf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 14 09:14:55 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Aug 17 10:17:50 2015 -0400
curl: Fix check for gethostbyname_r with 5 arguments
Fix the check code to pass 5 arguments instead of 6. This typo was
introduced in curl 7.39 but was not noticed because the result of
this check is used only if ENABLE_IPV6 is OFF.
diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c
index 04d5e7e..3c71232 100644
--- a/Utilities/cmcurl/CMake/CurlTests.c
+++ b/Utilities/cmcurl/CMake/CurlTests.c
@@ -139,7 +139,7 @@ int main(void)
rc = gethostbyname_r(address, &h, &hdata);
#elif defined(HAVE_GETHOSTBYNAME_R_5) || \
defined(HAVE_GETHOSTBYNAME_R_5_REENTRANT)
- rc = gethostbyname_r(address, &h, buffer, 8192, 0, &h_errnop);
+ rc = gethostbyname_r(address, &h, buffer, 8192, &h_errnop);
(void)hp; /* not used for test */
#elif defined(HAVE_GETHOSTBYNAME_R_6) || \
defined(HAVE_GETHOSTBYNAME_R_6_REENTRANT)
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list