[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-411-g578948e

[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  578948e3531e17f5a1c49eecef45b02ef8d37a8b (commit)
       via  22d4b85109a9c5e9b56c73e08d92b5722b52b05c (commit)
      from  015bbfb551db2dcd11900a60cf268c0b8afe5fdd (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=578948e3531e17f5a1c49eecef45b02ef8d37a8b
commit 578948e3531e17f5a1c49eecef45b02ef8d37a8b
Merge: 015bbfb 22d4b85
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 7 10:15:26 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 7 10:15:26 2014 -0500

    Merge topic 'update-curl' into next
    
    22d4b851 curl: Skip check for inet_pton on Windows


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22d4b85109a9c5e9b56c73e08d92b5722b52b05c
commit 22d4b85109a9c5e9b56c73e08d92b5722b52b05c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 7 10:13:10 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 7 10:13:10 2014 -0500

    curl: Skip check for inet_pton on Windows
    
    Re-apply part of the logic from commit v2.8.0~802 (ENH: allow for shared
    build of libcurl ..., 2009-04-10) to skip inet_pton on Windows.  On
    versions of Windows prior to Vista the function is not available at
    runtime.

diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 072e41a..cdd4996 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -29,6 +29,13 @@ set(DISABLED_THREADSAFE OFF CACHE INTERNAL "Curl can use thread-safe functions")
 set(ENABLE_IPV6 OFF CACHE INTERNAL "Curl IPv6 support")
 set(HTTP_ONLY OFF CACHE INTERNAL "Curl is not http-only")
 
+# Windows Vista and above have inet_pton, but this will link on
+# older versions and then the executable will fail to launch at
+# runtime on older versions because no DLL provides the symbol.
+if(WIN32)
+  set(HAVE_INET_PTON 0 CACHE INTERNAL "Do not use inet_pton")
+endif()
+
 #***************************************************************************
 #                                  _   _ ____  _
 #  Project                     ___| | | |  _ \| |

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

Summary of changes:
 Utilities/cmcurl/CMakeLists.txt |    7 +++++++
 1 file changed, 7 insertions(+)


hooks/post-receive
-- 
CMake