diff options
Diffstat (limited to 'Source/CTest/Curl/CMakeLists.txt')
| -rw-r--r-- | Source/CTest/Curl/CMakeLists.txt | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/Source/CTest/Curl/CMakeLists.txt b/Source/CTest/Curl/CMakeLists.txt index 898d64f..515b411 100644 --- a/Source/CTest/Curl/CMakeLists.txt +++ b/Source/CTest/Curl/CMakeLists.txt @@ -2,7 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 1.5) PROJECT(LIBCURL C) SET(PACKAGE "curl") -SET(VERSION "7.9.5") +SET(VERSION "7.10.2") +SET(PACKAGE_TARNAME " ") SET(OPERATING_SYSTEM ${CMAKE_SYSTEM_NAME}) SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}") @@ -52,6 +53,7 @@ SET(libCurl_SRCS llist.c hash.c multi.c + content_encoding.c ) IF(WIN32) @@ -86,6 +88,11 @@ IF(HAVE_LIBWS2_32) SET(CURL_LIBS ${CURL_LIBS} ws2_32) ENDIF(HAVE_LIBWS2_32) +CHECK_LIBRARY_EXISTS("z;${CURL_LIBS}" inflateEnd "" HAVE_LIBZ) +IF(HAVE_LIBZ) + SET(CURL_LIBS ${CURL_LIBS} z) +ENDIF(HAVE_LIBZ) + SET(CMAKE_REQUIRED_LIBRARIES ${CURL_LIBS}) CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H) @@ -97,6 +104,8 @@ CHECK_INCLUDE_FILE("fcntl.h" HAVE_FCNTL_H) CHECK_INCLUDE_FILE("malloc.h" HAVE_MALLOC_H) CHECK_INCLUDE_FILE("memory.h" HAVE_MEMORY_H) CHECK_INCLUDE_FILE("netdb.h" HAVE_NETDB_H) +CHECK_INCLUDE_FILE("zlib.h" HAVE_ZLIB_H) +CHECK_INCLUDE_FILE("sys/poll.h" HAVE_SYS_POLL_H) CHECK_INCLUDE_FILE("netinet/in.h" HAVE_NETINET_IN_H) CHECK_INCLUDE_FILE("sys/socket.h" HAVE_SYS_SOCKET_H) @@ -140,6 +149,7 @@ CHECK_INCLUDE_FILE("winsock.h" HAVE_WINSOCK_H) CHECK_INCLUDE_FILE("sockio.h" HAVE_SOCKIO_H) CHECK_INCLUDE_FILE("sys/sockio.h" HAVE_SYS_SOCKIO_H) CHECK_INCLUDE_FILE("x509.h" HAVE_X509_H) +CHECK_INCLUDE_FILE("setjmp.h" HAVE_SETJMP_H) CHECK_TYPE_SIZE(ssize_t SIZEOF_SSIZE_T) CHECK_TYPE_SIZE("long double" SIZEOF_LONG_DOUBLE) @@ -153,6 +163,7 @@ CHECK_FUNCTION_EXISTS(_doprnt HAVE_DOPRNT) CHECK_FUNCTION_EXISTS(vprintf HAVE_VPRINTF) CHECK_FUNCTION_EXISTS(socket HAVE_SOCKET) +CHECK_FUNCTION_EXISTS(poll HAVE_POLL) CHECK_FUNCTION_EXISTS(select HAVE_SELECT) CHECK_FUNCTION_EXISTS(strdup HAVE_STRDUP) CHECK_FUNCTION_EXISTS(strstr HAVE_STRSTR) @@ -175,6 +186,12 @@ CHECK_FUNCTION_EXISTS(closesocket HAVE_CLOSESOCKET) CHECK_FUNCTION_EXISTS(setvbuf HAVE_SETVBUF) CHECK_FUNCTION_EXISTS(sigaction HAVE_SIGACTION) CHECK_FUNCTION_EXISTS(signal HAVE_SIGNAL) +CHECK_FUNCTION_EXISTS(sigsetjmp HAVE_SIGSETJMP) +CHECK_FUNCTION_EXISTS(__sigsetjmp HAVE___SIGSETJMP) +IF(HAVE___SIGSETJMP) + SET(HAVE_SIGSETJMP 1) +ENDIF(HAVE___SIGSETJMP) + CHECK_FUNCTION_EXISTS(getpass_r HAVE_GETPASS_R) CHECK_FUNCTION_EXISTS(strlcat HAVE_STRLCAT) CHECK_FUNCTION_EXISTS(getpwuid HAVE_GETPWUID) |