[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-476-g705f2ac
Brad King
brad.king at kitware.com
Mon Nov 10 10:20:20 EST 2014
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 705f2acf56b79ec0479fb652a143229d954c6769 (commit)
via c02c747b85cf7bba8e81a955722122e844688d4c (commit)
via a427ed0cb86f56ebd84820cb0c6f3cfd2ccfa851 (commit)
via 17b24d552baa2bed05a277e3df11fe81d571a6f3 (commit)
via 4c3bd340804117c810c38273eee617911d475a36 (commit)
via 54cb23c657045c339a1a6060ea19d3a74a1c817b (commit)
via c50f03275481e3e1434b5c3153d8668dde6cefd8 (commit)
via 681693c99380467de6db0954e37903b527225886 (commit)
via 10d80b68e426abbe43c200bc3f29e05c12e01964 (commit)
via 19593042959274fab45f6bc0ef77d6ddc4532a0f (commit)
via cf54aebb968aa66b0990174db8b73c405f6e9c98 (commit)
via c17e3207fb49fe0c165167873fd608bae3ca19f2 (commit)
via 1f7cb7e27bac9b18834402ccff30685f69dd838c (commit)
via b18c9044122b0fbe7cc6c81efb48d0be8e065a23 (commit)
via 860f0a2ddc4b586d639caea1f9c7c10b381224e6 (commit)
via 5a3b55ed7c0419aa09adba38db41a258118dd580 (commit)
from 98bdf4a06ab89ef5d992827f7493902eee38819d (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=705f2acf56b79ec0479fb652a143229d954c6769
commit 705f2acf56b79ec0479fb652a143229d954c6769
Merge: 98bdf4a c02c747
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 10 10:20:18 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 10 10:20:18 2014 -0500
Merge topic 'update-curl' into next
c02c747b Tests: Update expected CTestTestFailedSubmit output
a427ed0c curl: Skip sanity check that triggers Clang warning
17b24d55 curl: Disable warnings to avoid changing 3rd party code
4c3bd340 curl: Skip check for inet_pton on Windows
54cb23c6 curl: Restore installation of OpenSSL DLLs
c50f0327 curl: Restore CURL_CA_BUNDLE option
681693c9 curl: Restore CMake-specific zlib selection code
10d80b68 curl: Restore CMake-specific test and install code
19593042 curl: Configure build to work within CMake
cf54aebb curl: Fix curl.h inclusion of curlbuild.h from CMake sources
c17e3207 curl: Use arch-aware CHECK_TYPE_SIZE results
1f7cb7e2 curl: Fix detection of headers with dependencies
b18c9044 curl: Drop inclusion of .rc file for static lib
860f0a2d curl: Select file APIs on Windows
5a3b55ed curl: Do not use 'dl' on HP-UX
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c02c747b85cf7bba8e81a955722122e844688d4c
commit c02c747b85cf7bba8e81a955722122e844688d4c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 8 12:09:39 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:13:39 2014 -0500
Tests: Update expected CTestTestFailedSubmit output
Add another error message that curl now produces.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 586f983..40fef07 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2675,6 +2675,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
set(regex "${regex}([Cc]ould *n.t resolve host")
set(regex "${regex}|[Cc]ould *n.t connect to host")
set(regex "${regex}|Failed *t*o* connect to")
+ set(regex "${regex}|Connection timed out after [0-9]+ milliseconds")
set(regex "${regex}|Empty reply from server")
set(regex "${regex}|The requested URL returned error")
set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a427ed0cb86f56ebd84820cb0c6f3cfd2ccfa851
commit a427ed0cb86f56ebd84820cb0c6f3cfd2ccfa851
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 8 13:30:02 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:13:39 2014 -0500
curl: Skip sanity check that triggers Clang warning
Defining curl APIs as forwarding macros triggers Clang warnings
with -Wdisabled-macro-expansion. Skip this sanity check.
diff --git a/Utilities/cmcurl/include/curl/curl.h b/Utilities/cmcurl/include/curl/curl.h
index 2792a96..40d0b81 100644
--- a/Utilities/cmcurl/include/curl/curl.h
+++ b/Utilities/cmcurl/include/curl/curl.h
@@ -2323,6 +2323,7 @@ CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
#include "typecheck-gcc.h"
#else
#if defined(__STDC__) && (__STDC__ >= 1)
+#if 0 /* Triggers clang -Wdisabled-macro-expansion, skip for CMake. */
/* This preprocessor magic that replaces a call with the exact same call is
only done to make sure application authors pass exactly three arguments
to these functions. */
@@ -2330,6 +2331,7 @@ CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask);
#define curl_easy_getinfo(handle,info,arg) curl_easy_getinfo(handle,info,arg)
#define curl_share_setopt(share,opt,param) curl_share_setopt(share,opt,param)
#define curl_multi_setopt(handle,opt,param) curl_multi_setopt(handle,opt,param)
+#endif
#endif /* __STDC__ >= 1 */
#endif /* gcc >= 4.3 && !__cplusplus */
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17b24d552baa2bed05a277e3df11fe81d571a6f3
commit 17b24d552baa2bed05a277e3df11fe81d571a6f3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 7 10:36:06 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:13:38 2014 -0500
curl: Disable warnings to avoid changing 3rd party code
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 71ebe9f..c4a930e 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -36,6 +36,14 @@ if(WIN32)
set(HAVE_INET_PTON 0 CACHE INTERNAL "Do not use inet_pton")
endif()
+# Disable warnings to avoid changing 3rd party code.
+if(CMAKE_C_COMPILER_ID MATCHES
+ "^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w")
+elseif(CMAKE_C_COMPILER_ID STREQUAL "PathScale")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall")
+endif()
+
#***************************************************************************
# _ _ ____ _
# Project ___| | | | _ \| |
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c3bd340804117c810c38273eee617911d475a36
commit 4c3bd340804117c810c38273eee617911d475a36
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: Mon Nov 10 10:13:38 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 02acbd9..71ebe9f 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 ___| | | | _ \| |
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54cb23c657045c339a1a6060ea19d3a74a1c817b
commit 54cb23c657045c339a1a6060ea19d3a74a1c817b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 3 13:44:21 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:13:38 2014 -0500
curl: Restore installation of OpenSSL DLLs
Restore logic originally added by commit v2.8.10~119^2~1 (curl: Make
OpenSSL DLLs available to CMake on Windows, 2012-09-06).
diff --git a/Utilities/cmcurl/lib/CMakeLists.txt b/Utilities/cmcurl/lib/CMakeLists.txt
index 6188ddb..a4621c1 100644
--- a/Utilities/cmcurl/lib/CMakeLists.txt
+++ b/Utilities/cmcurl/lib/CMakeLists.txt
@@ -88,10 +88,35 @@ else()
set(CURL_USER_DEFINED_DYNAMIC_OR_STATIC SHARED)
endif()
+# For windows we want to install OPENSSL_LIBRARIES dlls
+# and also copy them into the build tree so that testing
+# can find them.
+if(CMAKE_USE_OPENSSL AND OPENSSL_FOUND AND WIN32)
+ find_file(CMAKE_EAY_DLL NAME libeay32.dll HINTS ${OPENSSL_INCLUDE_DIR}/..)
+ find_file(CMAKE_SSL_DLL NAME ssleay32.dll HINTS ${OPENSSL_INCLUDE_DIR}/..)
+ mark_as_advanced(CMAKE_EAY_DLL CMAKE_SSL_DLL)
+ if(CMAKE_SSL_DLL AND CMAKE_EAY_DLL)
+ set(CMAKE_CURL_SSL_DLLS ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/libeay32.dll
+ ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/ssleay32.dll)
+ add_custom_command(OUTPUT
+ ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/libeay32.dll
+ DEPENDS ${CMAKE_EAY_DLL}
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_EAY_DLL}
+ ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/libeay32.dll)
+ add_custom_command(OUTPUT
+ ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/ssleay32.dll
+ DEPENDS ${CMAKE_SSL_DLL}
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SSL_DLL}
+ ${CMake_BIN_DIR}/${CMAKE_CFG_INTDIR}/ssleay32.dll)
+ install(PROGRAMS ${CMAKE_EAY_DLL} ${CMAKE_SSL_DLL} DESTINATION bin)
+ endif()
+endif()
+
add_library(
${LIB_NAME}
${CURL_USER_DEFINED_DYNAMIC_OR_STATIC}
${HHEADERS} ${CSOURCES}
+ ${CMAKE_CURL_SSL_DLLS}
)
target_link_libraries(${LIB_NAME} ${CURL_LIBS})
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c50f03275481e3e1434b5c3153d8668dde6cefd8
commit c50f03275481e3e1434b5c3153d8668dde6cefd8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 3 13:43:01 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:13:38 2014 -0500
curl: Restore CURL_CA_BUNDLE option
Restore the option added by commit v2.8.8~200^2 (Add CURL_CA_BUNDLE
option for SSL support, 2012-02-09).
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index ba2ef13..02acbd9 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -437,6 +437,13 @@ if(CMAKE_USE_OPENSSL)
check_include_file_concat("openssl/ssl.h" HAVE_OPENSSL_SSL_H)
check_include_file_concat("openssl/x509.h" HAVE_OPENSSL_X509_H)
check_include_file_concat("openssl/rand.h" HAVE_OPENSSL_RAND_H)
+
+ # Optionally build with a specific CA cert bundle.
+ set(CURL_CA_BUNDLE "" CACHE FILEPATH "Path to SSL CA Certificate Bundle")
+ mark_as_advanced(CURL_CA_BUNDLE)
+ if(CURL_CA_BUNDLE)
+ add_definitions(-DCURL_CA_BUNDLE="${CURL_CA_BUNDLE}")
+ endif()
endif(OPENSSL_FOUND)
endif(CMAKE_USE_OPENSSL)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=681693c99380467de6db0954e37903b527225886
commit 681693c99380467de6db0954e37903b527225886
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 31 11:46:12 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:13:38 2014 -0500
curl: Restore CMake-specific zlib selection code
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index d42cddf..ba2ef13 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -25,7 +25,6 @@ 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(CURL_ZLIB ON CACHE INTERNAL "Enable curl zlib")
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")
@@ -383,6 +382,7 @@ check_library_exists("${CURL_LIBS}" dlopen "" HAVE_DLOPEN)
# For other tests to use the same libraries
set(CMAKE_REQUIRED_LIBRARIES ${CURL_LIBS})
+if(0) # This code not needed for building within CMake.
option(CURL_ZLIB "Set to ON to enable building cURL with zlib support." ON)
set(HAVE_LIBZ OFF)
set(HAVE_ZLIB_H OFF)
@@ -396,6 +396,19 @@ if(CURL_ZLIB)
list(APPEND CURL_LIBS ${ZLIB_LIBRARIES})
endif()
endif()
+endif()
+
+#-----------------------------------------------------------------------------
+# CMake-specific curl code.
+
+if(CURL_SPECIAL_LIBZ)
+ set(CURL_LIBS ${CURL_LIBS} "${CURL_SPECIAL_LIBZ}")
+ include_directories(${CURL_SPECIAL_LIBZ_INCLUDES})
+ set(HAVE_LIBZ 0)
+ set(HAVE_ZLIB_H 0)
+endif()
+
+#-----------------------------------------------------------------------------
option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" OFF)
mark_as_advanced(CMAKE_USE_OPENSSL)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10d80b68e426abbe43c200bc3f29e05c12e01964
commit 10d80b68e426abbe43c200bc3f29e05c12e01964
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 30 09:23:01 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:13:38 2014 -0500
curl: Restore CMake-specific test and install code
Restore the LIBCURL test used previously within CMake. Restore
installation of the 'COPYING' file with the CMake documentation.
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index f37cd0b..d42cddf 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -908,6 +908,18 @@ if(BUILD_CURL_TESTS)
add_subdirectory(tests)
endif()
+#-----------------------------------------------------------------------------
+# CMake-specific curl code.
+add_executable(LIBCURL curltest.c)
+target_link_libraries(LIBCURL cmcurl)
+
+if(CMAKE_CURL_TEST_URL)
+ add_test(curl LIBCURL ${CMAKE_CURL_TEST_URL})
+endif()
+
+install(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmcurl)
+#-----------------------------------------------------------------------------
+
if(0) # This code not needed for building within CMake.
# This needs to be run very last so other parts of the scripts can take advantage of this.
if(NOT CURL_CONFIG_HAS_BEEN_RUN_BEFORE)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19593042959274fab45f6bc0ef77d6ddc4532a0f
commit 19593042959274fab45f6bc0ef77d6ddc4532a0f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 30 09:11:10 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:13:37 2014 -0500
curl: Configure build to work within CMake
Set curl build options as needed for CMake rather than presenting them
to the user in the cache. Drop the CMAKE_BUILD_CURL_SHARED option for
now.
Change the curl library name to 'cmcurl'. Disable blocks of code within
curl CMakeLists.txt files that we do not need for CMake, but leave the
code in place to make merging with curl updates easier.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2060ea..58e0a1f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,10 +271,7 @@ macro (CMAKE_BUILD_UTILITIES)
set(CURL_SPECIAL_ZLIB_H ${CMAKE_ZLIB_HEADER})
set(CURL_SPECIAL_LIBZ_INCLUDES ${CMAKE_ZLIB_INCLUDES})
set(CURL_SPECIAL_LIBZ ${CMAKE_ZLIB_LIBRARIES})
- option(CMAKE_BUILD_CURL_SHARED "Should curl be built shared" FALSE)
- if(NOT CMAKE_BUILD_CURL_SHARED)
- add_definitions(-DCURL_STATICLIB)
- endif()
+ add_definitions(-DCURL_STATICLIB)
set(CMAKE_CURL_INCLUDES)
set(CMAKE_CURL_LIBRARIES cmcurl)
if(CMAKE_TESTS_CDASH_SERVER)
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index dffa4a3..f37cd0b 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -1,3 +1,35 @@
+# Set curl options as needed for CMake build
+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_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")
+set(CURL_DISABLE_CRYPTO_AUTH OFF CACHE INTERNAL "Do not disable curl crypto auth")
+set(CURL_DISABLE_DICT ON CACHE INTERNAL "Disable curl dict protocol?")
+set(CURL_DISABLE_FILE OFF CACHE INTERNAL "Disable curl file protocol?")
+set(CURL_DISABLE_FTP OFF CACHE INTERNAL "Disable curl ftp protocol?")
+set(CURL_DISABLE_GOPHER ON CACHE INTERNAL "Disable curl gopher protocol?")
+set(CURL_DISABLE_HTTP OFF CACHE INTERNAL "Disable curl http protocol?")
+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_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_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(CURL_ZLIB ON CACHE INTERNAL "Enable curl zlib")
+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")
+
#***************************************************************************
# _ _ ____ _
# Project ___| | | | _ \| |
@@ -45,7 +77,9 @@ include(Macros)
project( CURL C )
+if(0) # This code not needed for building within CMake.
message(WARNING "the curl cmake build system is poorly maintained. Be aware")
+endif()
file (READ ${CURL_SOURCE_DIR}/include/curl/curlver.h CURL_VERSION_H_CONTENTS)
string (REGEX MATCH "LIBCURL_VERSION_MAJOR[ \t]+([0-9]+)"
@@ -69,7 +103,9 @@ include_regular_expression("^.*$") # Sukender: Is it necessary?
# Setup package meta-data
# SET(PACKAGE "curl")
set(CURL_VERSION ${CURL_MAJOR_VERSION}.${CURL_MINOR_VERSION}.${CURL_PATCH_VERSION})
+if(0) # This code not needed for building within CMake.
message(STATUS "curl version=[${CURL_VERSION}]")
+endif()
# SET(PACKAGE_TARNAME "curl")
# SET(PACKAGE_NAME "curl")
# SET(PACKAGE_VERSION "-")
@@ -361,7 +397,7 @@ if(CURL_ZLIB)
endif()
endif()
-option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" ON)
+option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" OFF)
mark_as_advanced(CMAKE_USE_OPENSSL)
set(USE_SSLEAY OFF)
@@ -872,6 +908,7 @@ if(BUILD_CURL_TESTS)
add_subdirectory(tests)
endif()
+if(0) # This code not needed for building within CMake.
# This needs to be run very last so other parts of the scripts can take advantage of this.
if(NOT CURL_CONFIG_HAS_BEEN_RUN_BEFORE)
set(CURL_CONFIG_HAS_BEEN_RUN_BEFORE 1 CACHE INTERNAL "Flag to track whether this is the first time running CMake or if CMake has been configured before")
@@ -896,3 +933,4 @@ if(MSVC_VERSION EQUAL 1600)
file(APPEND "${CURL_SLN_FILENAME}" "\n# This should be regenerated!\n")
endif()
endif()
+endif()
diff --git a/Utilities/cmcurl/lib/CMakeLists.txt b/Utilities/cmcurl/lib/CMakeLists.txt
index 3d5c3e3..6188ddb 100644
--- a/Utilities/cmcurl/lib/CMakeLists.txt
+++ b/Utilities/cmcurl/lib/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(LIB_NAME libcurl)
+set(LIB_NAME cmcurl)
configure_file(${CURL_SOURCE_DIR}/include/curl/curlbuild.h.cmake
${CURL_BINARY_DIR}/include/curl/curlbuild.h)
@@ -96,14 +96,17 @@ add_library(
target_link_libraries(${LIB_NAME} ${CURL_LIBS})
+if(0) # This code not needed for building within CMake.
if(WIN32)
add_definitions( -D_USRDLL )
endif()
+endif()
set_target_properties(${LIB_NAME} PROPERTIES COMPILE_DEFINITIONS BUILDING_LIBCURL)
setup_curl_dependencies(${LIB_NAME})
+if(0) # This code not needed for building within CMake.
# Remove the "lib" prefix since the library is already named "libcurl".
set_target_properties(${LIB_NAME} PROPERTIES PREFIX "")
set_target_properties(${LIB_NAME} PROPERTIES IMPORT_PREFIX "")
@@ -116,3 +119,4 @@ if(WIN32)
endif()
install(TARGETS ${LIB_NAME} DESTINATION lib)
+endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf54aebb968aa66b0990174db8b73c405f6e9c98
commit cf54aebb968aa66b0990174db8b73c405f6e9c98
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 29 19:35:22 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:13:37 2014 -0500
curl: Fix curl.h inclusion of curlbuild.h from CMake sources
Use a CMake-specific path to this configured header so that it works
when included from a CMake source file in addition to curl sources.
We do not install the Curl headers with CMake, so this hack is okay.
diff --git a/Utilities/cmcurl/include/curl/curl.h b/Utilities/cmcurl/include/curl/curl.h
index 1df2fe4..2792a96 100644
--- a/Utilities/cmcurl/include/curl/curl.h
+++ b/Utilities/cmcurl/include/curl/curl.h
@@ -31,7 +31,7 @@
*/
#include "curlver.h" /* libcurl version defines */
-#include "curlbuild.h" /* libcurl build definitions */
+#include "cmcurl/include/curl/curlbuild.h" /* libcurl build definitions */
#include "curlrules.h" /* libcurl rules enforcement */
/*
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c17e3207fb49fe0c165167873fd608bae3ca19f2
commit c17e3207fb49fe0c165167873fd608bae3ca19f2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 8 07:28:08 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:13:37 2014 -0500
curl: Use arch-aware CHECK_TYPE_SIZE results
Re-apply the logic change made by commit v2.8.2~536 (Use arch-aware
CHECK_TYPE_SIZE result, 2009-12-17). The size of some types must be
selected at preprocessing time when building for multiple archs on OS X.
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 61e6fa5..dffa4a3 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -521,58 +521,12 @@ check_type_size("short" SIZEOF_SHORT)
check_type_size("int" SIZEOF_INT)
check_type_size("__int64" SIZEOF___INT64)
check_type_size("time_t" SIZEOF_TIME_T)
-if(NOT HAVE_SIZEOF_SSIZE_T)
- if(SIZEOF_LONG EQUAL SIZEOF_SIZE_T)
- set(ssize_t long)
- endif(SIZEOF_LONG EQUAL SIZEOF_SIZE_T)
- if(NOT ssize_t AND SIZEOF___INT64 EQUAL SIZEOF_SIZE_T)
- set(ssize_t __int64)
- endif(NOT ssize_t AND SIZEOF___INT64 EQUAL SIZEOF_SIZE_T)
-endif(NOT HAVE_SIZEOF_SSIZE_T)
-
-# Different sizeofs, etc.
-
-# define CURL_SIZEOF_LONG 4
-# define CURL_TYPEOF_CURL_OFF_T long long
-# define CURL_FORMAT_CURL_OFF_T "lld"
-# define CURL_FORMAT_CURL_OFF_TU "llu"
-# define CURL_FORMAT_OFF_T "%lld"
-# define CURL_SIZEOF_CURL_OFF_T 8
-# define CURL_SUFFIX_CURL_OFF_T LL
-# define CURL_SUFFIX_CURL_OFF_TU ULL
-
-set(CURL_SIZEOF_LONG ${SIZEOF_LONG})
-
-if(SIZEOF_LONG EQUAL 8)
- set(CURL_TYPEOF_CURL_OFF_T long)
- set(CURL_SIZEOF_CURL_OFF_T 8)
- set(CURL_FORMAT_CURL_OFF_T "ld")
- set(CURL_FORMAT_CURL_OFF_TU "lu")
- set(CURL_FORMAT_OFF_T "%ld")
- set(CURL_SUFFIX_CURL_OFF_T L)
- set(CURL_SUFFIX_CURL_OFF_TU UL)
-endif(SIZEOF_LONG EQUAL 8)
-
-if(SIZEOF_LONG_LONG EQUAL 8)
- set(CURL_TYPEOF_CURL_OFF_T "long long")
- set(CURL_SIZEOF_CURL_OFF_T 8)
- set(CURL_FORMAT_CURL_OFF_T "lld")
- set(CURL_FORMAT_CURL_OFF_TU "llu")
- set(CURL_FORMAT_OFF_T "%lld")
- set(CURL_SUFFIX_CURL_OFF_T LL)
- set(CURL_SUFFIX_CURL_OFF_TU ULL)
-endif(SIZEOF_LONG_LONG EQUAL 8)
-
-if(NOT CURL_TYPEOF_CURL_OFF_T)
- set(CURL_TYPEOF_CURL_OFF_T ${ssize_t})
- set(CURL_SIZEOF_CURL_OFF_T ${SIZEOF_SSIZE_T})
- # TODO: need adjustment here.
- set(CURL_FORMAT_CURL_OFF_T "ld")
- set(CURL_FORMAT_CURL_OFF_TU "lu")
- set(CURL_FORMAT_OFF_T "%ld")
- set(CURL_SUFFIX_CURL_OFF_T L)
- set(CURL_SUFFIX_CURL_OFF_TU LU)
-endif(NOT CURL_TYPEOF_CURL_OFF_T)
+check_type_size("off_t" SIZEOF_OFF_T)
+
+# Make public versions of some type sizes for curlbuild.h.
+foreach(t INT LONG LONG_LONG SSIZE_T)
+ string(REPLACE "SIZEOF_" "CURL_SIZEOF_" CURL_SIZEOF_${t}_CODE "${SIZEOF_${t}_CODE}")
+endforeach()
if(HAVE_SIZEOF_LONG_LONG)
set(HAVE_LONGLONG 1)
@@ -835,6 +789,7 @@ if(CMAKE_COMPILER_IS_GNUCC AND APPLE)
endif(CMAKE_COMPILER_IS_GNUCC AND APPLE)
if(HAVE_SOCKLEN_T)
+ set(CURL_HAVE_SOCKLEN_T 1)
set(CURL_TYPEOF_CURL_SOCKLEN_T "socklen_t")
if(WIN32)
set(CMAKE_EXTRA_INCLUDE_FILES "winsock2.h;ws2tcpip.h")
@@ -848,8 +803,7 @@ if(HAVE_SOCKLEN_T)
"Check for sizeof socklen_t failed, see CMakeFiles/CMakerror.log")
endif()
else()
- set(CURL_TYPEOF_CURL_SOCKLEN_T int)
- set(CURL_SIZEOF_CURL_SOCKLEN_T ${SIZEOF_INT})
+ set(CURL_HAVE_SOCKLEN_T 0)
endif()
# TODO test which of these headers are required for the typedefs used in curlbuild.h
diff --git a/Utilities/cmcurl/include/curl/curlbuild.h.cmake b/Utilities/cmcurl/include/curl/curlbuild.h.cmake
index 60bc7a7..6608694 100644
--- a/Utilities/cmcurl/include/curl/curlbuild.h.cmake
+++ b/Utilities/cmcurl/include/curl/curlbuild.h.cmake
@@ -158,40 +158,61 @@
# include <sys/poll.h>
#endif
+/* The size of `int', as computed by sizeof. */
+ at CURL_SIZEOF_INT_CODE@
+
/* The size of `long', as computed by sizeof. */
-#define CURL_SIZEOF_LONG ${CURL_SIZEOF_LONG}
+ at CURL_SIZEOF_LONG_CODE@
+
+/* The size of `long long', as computed by sizeof. */
+ at CURL_SIZEOF_LONG_LONG_CODE@
+
+/* The size of `ssize_t', as computed by sizeof. */
+ at CURL_SIZEOF_SSIZE_T_CODE@
+#define CURL_HAVE_SOCKLEN_T @CURL_HAVE_SOCKLEN_T@
+#if CURL_HAVE_SOCKLEN_T
/* Integral data type used for curl_socklen_t. */
-#define CURL_TYPEOF_CURL_SOCKLEN_T ${CURL_TYPEOF_CURL_SOCKLEN_T}
+#define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
/* The size of `curl_socklen_t', as computed by sizeof. */
-#define CURL_SIZEOF_CURL_SOCKLEN_T ${CURL_SIZEOF_CURL_SOCKLEN_T}
+ at CURL_SIZEOF_CURL_SOCKLEN_T_CODE@
+#else
+# define CURL_TYPEOF_CURL_SOCKLEN_T int
+# define CURL_SIZEOF_CURL_SOCKLEN_T CURL_SIZEOF_INT
+#endif
/* Data type definition of curl_socklen_t. */
typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
-/* Signed integral data type used for curl_off_t. */
-#define CURL_TYPEOF_CURL_OFF_T ${CURL_TYPEOF_CURL_OFF_T}
+#if CURL_SIZEOF_LONG == 8
+# define CURL_TYPEOF_CURL_OFF_T long
+# define CURL_SIZEOF_CURL_OFF_T 8
+# define CURL_FORMAT_CURL_OFF_T "ld"
+# define CURL_FORMAT_CURL_OFF_TU "lu"
+# define CURL_FORMAT_OFF_T "%ld"
+# define CURL_SUFFIX_CURL_OFF_T L
+# define CURL_SUFFIX_CURL_OFF_TU UL
+#elif CURL_SIZEOF_LONG_LONG == 8
+# define CURL_TYPEOF_CURL_OFF_T long long
+# define CURL_SIZEOF_CURL_OFF_T 8
+# define CURL_FORMAT_CURL_OFF_T "lld"
+# define CURL_FORMAT_CURL_OFF_TU "llu"
+# define CURL_FORMAT_OFF_T "%lld"
+# define CURL_SUFFIX_CURL_OFF_T LL
+# define CURL_SUFFIX_CURL_OFF_TU ULL
+#else
+# define CURL_TYPEOF_CURL_OFF_T ssize_t
+# define CURL_SIZEOF_CURL_OFF_T CURL_SIZEOF_SSIZE_T
+/* TODO: need adjustment here. */
+# define CURL_FORMAT_CURL_OFF_T "ld"
+# define CURL_FORMAT_CURL_OFF_TU "lu"
+# define CURL_FORMAT_OFF_T "%ld"
+# define CURL_SUFFIX_CURL_OFF_T L
+# define CURL_SUFFIX_CURL_OFF_TU UL
+#endif
/* Data type definition of curl_off_t. */
typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
-/* curl_off_t formatting string directive without "%" conversion specifier. */
-#define CURL_FORMAT_CURL_OFF_T "${CURL_FORMAT_CURL_OFF_T}"
-
-/* unsigned curl_off_t formatting string without "%" conversion specifier. */
-#define CURL_FORMAT_CURL_OFF_TU "${CURL_FORMAT_CURL_OFF_TU}"
-
-/* curl_off_t formatting string directive with "%" conversion specifier. */
-#define CURL_FORMAT_OFF_T "${CURL_FORMAT_OFF_T}"
-
-/* The size of `curl_off_t', as computed by sizeof. */
-#define CURL_SIZEOF_CURL_OFF_T ${CURL_SIZEOF_CURL_OFF_T}
-
-/* curl_off_t constant suffix. */
-#define CURL_SUFFIX_CURL_OFF_T ${CURL_SUFFIX_CURL_OFF_T}
-
-/* unsigned curl_off_t constant suffix. */
-#define CURL_SUFFIX_CURL_OFF_TU ${CURL_SUFFIX_CURL_OFF_TU}
-
#endif /* __CURL_CURLBUILD_H */
diff --git a/Utilities/cmcurl/lib/curl_config.h.cmake b/Utilities/cmcurl/lib/curl_config.h.cmake
index ed55a65..b5db3b6 100644
--- a/Utilities/cmcurl/lib/curl_config.h.cmake
+++ b/Utilities/cmcurl/lib/curl_config.h.cmake
@@ -847,25 +847,25 @@
#cmakedefine SEND_TYPE_RETV ${SEND_TYPE_RETV}
/* The size of `int', as computed by sizeof. */
-#cmakedefine SIZEOF_INT ${SIZEOF_INT}
+ at SIZEOF_INT_CODE@
/* The size of `short', as computed by sizeof. */
-#cmakedefine SIZEOF_SHORT ${SIZEOF_SHORT}
+ at SIZEOF_SHORT_CODE@
/* The size of `long', as computed by sizeof. */
-#cmakedefine SIZEOF_LONG ${SIZEOF_LONG}
+ at SIZEOF_LONG_CODE@
/* The size of `off_t', as computed by sizeof. */
-#cmakedefine SIZEOF_OFF_T ${SIZEOF_OFF_T}
+ at SIZEOF_OFF_T_CODE@
/* The size of `size_t', as computed by sizeof. */
-#cmakedefine SIZEOF_SIZE_T ${SIZEOF_SIZE_T}
+ at SIZEOF_SIZE_T_CODE@
-/* The size of `time_t', as computed by sizeof. */
-#cmakedefine SIZEOF_TIME_T ${SIZEOF_TIME_T}
+/* The size of `ssize_t', as computed by sizeof. */
+ at SIZEOF_SSIZE_T_CODE@
-/* The size of `void*', as computed by sizeof. */
-#cmakedefine SIZEOF_VOIDP ${SIZEOF_VOIDP}
+/* The size of `time_t', as computed by sizeof. */
+ at SIZEOF_TIME_T_CODE@
/* Define to 1 if you have the ANSI C header files. */
#cmakedefine STDC_HEADERS 1
@@ -948,4 +948,14 @@
#cmakedefine size_t ${size_t}
/* the signed version of size_t */
-#cmakedefine ssize_t ${ssize_t}
+#ifndef SIZEOF_SSIZE_T
+# if SIZEOF_LONG == SIZEOF_SIZE_T
+ typedef long ssize_t;
+# elif SIZEOF_LONG_LONG == SIZEOF_SIZE_T
+ typedef long long ssize_t;
+# elif SIZEOF___INT64 == SIZEOF_SIZE_T
+ typedef __int64 ssize_t;
+# else
+ typedef int ssize_t;
+# endif
+#endif
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1f7cb7e27bac9b18834402ccff30685f69dd838c
commit 1f7cb7e27bac9b18834402ccff30685f69dd838c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 6 22:22:11 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:13:37 2014 -0500
curl: Fix detection of headers with dependencies
Restore the check_include_file_concat functionality broken
in upstream curl. The <net/if.h> header on older OS X versions
depends on <sys/socket.h> begin included first, for example.
diff --git a/Utilities/cmcurl/CMake/Macros.cmake b/Utilities/cmcurl/CMake/Macros.cmake
index c770a55..0f8eb57 100644
--- a/Utilities/cmcurl/CMake/Macros.cmake
+++ b/Utilities/cmcurl/CMake/Macros.cmake
@@ -12,7 +12,7 @@ endmacro(CHECK_LIBRARY_EXISTS_CONCAT)
# Check if header file exists and add it to the list.
macro(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE)
- check_include_file("${FILE}" ${VARIABLE})
+ check_include_files("${CURL_INCLUDES};${FILE}" ${VARIABLE})
if(${VARIABLE})
set(CURL_INCLUDES ${CURL_INCLUDES} ${FILE})
set(CURL_TEST_DEFINES "${CURL_TEST_DEFINES} -D${VARIABLE}")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b18c9044122b0fbe7cc6c81efb48d0be8e065a23
commit b18c9044122b0fbe7cc6c81efb48d0be8e065a23
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 6 15:31:38 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:11:26 2014 -0500
curl: Drop inclusion of .rc file for static lib
The resource file is only needed for the curl .dll, so skip it when
building the static library. This avoids the need to add the
'/machine:' link flag on MS tools for creating a static library.
diff --git a/Utilities/cmcurl/lib/CMakeLists.txt b/Utilities/cmcurl/lib/CMakeLists.txt
index b2bcf09..3d5c3e3 100644
--- a/Utilities/cmcurl/lib/CMakeLists.txt
+++ b/Utilities/cmcurl/lib/CMakeLists.txt
@@ -13,7 +13,7 @@ list(APPEND HHEADERS
${CURL_BINARY_DIR}/include/curl/curlbuild.h
)
-if(MSVC)
+if(MSVC AND NOT CURL_STATICLIB)
list(APPEND CSOURCES libcurl.rc)
endif()
@@ -94,10 +94,6 @@ add_library(
${HHEADERS} ${CSOURCES}
)
-if(MSVC AND CURL_STATICLIB)
- set_target_properties(${LIB_NAME} PROPERTIES STATIC_LIBRARY_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
-endif()
-
target_link_libraries(${LIB_NAME} ${CURL_LIBS})
if(WIN32)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=860f0a2ddc4b586d639caea1f9c7c10b381224e6
commit 860f0a2ddc4b586d639caea1f9c7c10b381224e6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 3 13:17:24 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:00:45 2014 -0500
curl: Select file APIs on Windows
Choose small or large file support based on capabilities of compiler
and target platform.
diff --git a/Utilities/cmcurl/lib/curl_config.h.cmake b/Utilities/cmcurl/lib/curl_config.h.cmake
index 32bae39..ed55a65 100644
--- a/Utilities/cmcurl/lib/curl_config.h.cmake
+++ b/Utilities/cmcurl/lib/curl_config.h.cmake
@@ -906,10 +906,6 @@
/* if SSL is enabled */
#cmakedefine USE_SSLEAY 1
-/* Define to 1 if you are building a Windows target without large file
- support. */
-#cmakedefine USE_WIN32_LARGE_FILES 1
-
/* to enable SSPI support */
#cmakedefine USE_WINDOWS_SSPI 1
diff --git a/Utilities/cmcurl/lib/curl_setup.h b/Utilities/cmcurl/lib/curl_setup.h
index 173731c..12238ca 100644
--- a/Utilities/cmcurl/lib/curl_setup.h
+++ b/Utilities/cmcurl/lib/curl_setup.h
@@ -345,6 +345,17 @@
#include <clib.h>
#endif
+/* Default Windows file API selection. */
+#ifdef _WIN32
+# if defined(_MSC_VER) && (_INTEGRAL_MAX_BITS >= 64)
+# define USE_WIN32_LARGE_FILES
+# elif defined(__MINGW32__)
+# define USE_WIN32_LARGE_FILES
+# else
+# define USE_WIN32_SMALL_FILES
+# endif
+#endif
+
/*
* Large file (>2Gb) support using WIN32 functions.
*/
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a3b55ed7c0419aa09adba38db41a258118dd580
commit 5a3b55ed7c0419aa09adba38db41a258118dd580
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sat Nov 8 06:18:16 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 10 10:00:45 2014 -0500
curl: Do not use 'dl' on HP-UX
Re-apply the logic change made by commit v2.8.0~1427 (fix warning on
HPUX, 2008-11-26).
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index ca5f34f..61e6fa5 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -204,7 +204,13 @@ if(WIN32)
endif(WIN32)
# Check for all needed libraries
+if(0) # This code not needed for building within CMake.
check_library_exists_concat("dl" dlopen HAVE_LIBDL)
+else()
+ # Use the cmake-defined dl libs as dl is should not be used
+ # on HPUX, but rather dld this avoids a warning
+ list(APPEND CURL_LIBS ${CMAKE_DL_LIBS})
+endif()
check_library_exists_concat("socket" connect HAVE_LIBSOCKET)
check_library_exists("c" gethostbyname "" NOT_NEED_LIBNSL)
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list