diff options
| -rw-r--r-- | Source/CTest/Curl/CMake/CheckTypeSize.cmake | 2 | ||||
| -rw-r--r-- | Source/CTest/Curl/CMake/CurlTests.c | 31 | ||||
| -rw-r--r-- | Source/CTest/Curl/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 3 |
4 files changed, 44 insertions, 4 deletions
diff --git a/Source/CTest/Curl/CMake/CheckTypeSize.cmake b/Source/CTest/Curl/CMake/CheckTypeSize.cmake index c9a71f0..ddc990a 100644 --- a/Source/CTest/Curl/CMake/CheckTypeSize.cmake +++ b/Source/CTest/Curl/CMake/CheckTypeSize.cmake @@ -22,7 +22,7 @@ MACRO(CHECK_TYPE_SIZE TYPE VARIABLE) FOREACH(def ${CMAKE_EXTRA_INCLUDE_FILES}) SET(CHECK_TYPE_SIZE_PREMAIN "${CHECK_TYPE_SIZE_PREMAIN}#include \"${def}\"\n") ENDFOREACH(def) - CONFIGURE_FILE("${CMAKE_ROOT}/Modules/CheckTypeSize.c.in" + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/CMake/CheckTypeSize.c.in" "${CMAKE_BINARY_DIR}/CMakeTmp/CheckTypeSize.c" IMMEDIATE @ONLY) FILE(READ "${CMAKE_BINARY_DIR}/CMakeTmp/CheckTypeSize.c" CHECK_TYPE_SIZE_FILE_CONTENT) diff --git a/Source/CTest/Curl/CMake/CurlTests.c b/Source/CTest/Curl/CMake/CurlTests.c index a637b38..d8a12f6 100644 --- a/Source/CTest/Curl/CMake/CurlTests.c +++ b/Source/CTest/Curl/CMake/CurlTests.c @@ -427,3 +427,34 @@ void main(void) { ? 1 : -1]; int main () { ; return 0; } #endif +#ifdef HAVE_IOCTLSOCKET +#include <windows.h> + +int +main () +{ + +/* ioctlsocket source code */ + int socket; + unsigned long flags = ioctlsocket(socket, FIONBIO, &flags); + + ; + return 0; +} + +#endif +#ifdef HAVE_IOCTLSOCKET_CASE +#include <windows.h> + +int +main () +{ + +/* IoctlSocket source code */ + int socket; + int flags = IoctlSocket(socket, FIONBIO, (long)1); + + ; + return 0; +} +#endif diff --git a/Source/CTest/Curl/CMakeLists.txt b/Source/CTest/Curl/CMakeLists.txt index 61a174d..5156960 100644 --- a/Source/CTest/Curl/CMakeLists.txt +++ b/Source/CTest/Curl/CMakeLists.txt @@ -78,7 +78,6 @@ SET(libCurl_SRCS ssluse.c strequal.c strerror.c - strtok.c strtoofft.c telnet.c timeval.c @@ -263,6 +262,10 @@ CHECK_SYMBOL_EXISTS(uname "${CURL_INCLUDES}" HAVE_UNAME) CHECK_SYMBOL_EXISTS(strcasecmp "${CURL_INCLUDES}" HAVE_STRCASECMP) CHECK_SYMBOL_EXISTS(stricmp "${CURL_INCLUDES}" HAVE_STRICMP) CHECK_SYMBOL_EXISTS(strcmpi "${CURL_INCLUDES}" HAVE_STRCMPI) +CHECK_SYMBOL_EXISTS(strncmpi "${CURL_INCLUDES}" HAVE_STRNCMPI) +IF(NOT HAVE_STRNCMPI) + SET(HAVE_STRCMPI) +ENDIF(NOT HAVE_STRNCMPI) CHECK_SYMBOL_EXISTS(gethostbyaddr "${CURL_INCLUDES}" HAVE_GETHOSTBYADDR) CHECK_SYMBOL_EXISTS(gettimeofday "${CURL_INCLUDES}" HAVE_GETTIMEOFDAY) CHECK_SYMBOL_EXISTS(inet_addr "${CURL_INCLUDES}" HAVE_INET_ADDR) @@ -361,7 +364,9 @@ ENDMACRO(CURL_INTERNAL_TEST) FOREACH(CURL_TEST TIME_WITH_SYS_TIME HAVE_O_NONBLOCK - HAVE_GETHOSTBYADDR_R_5 + HAVE_IOCTLSOCKET + HAVE_IOCTLSOCKET_CASE + HAVE_O_NONBLOCKHAVE_GETHOSTBYADDR_R_5 HAVE_GETHOSTBYADDR_R_7 HAVE_GETHOSTBYADDR_R_8 HAVE_GETHOSTBYADDR_R_5_REENTRANT @@ -458,6 +463,9 @@ SET(CMAKE_REQUIRED_FLAGS) # Check for nonblocking #OPTION(CURL_HAVE_DISABLED_NONBLOCKING "Disable non-blocking socket detection" OFF) SET(HAVE_DISABLED_NONBLOCKING) +IF(WIN32) + SET(CURL_HAVE_DISABLED_NONBLOCKING 1) +ENDIF(WIN32) IF(CURL_HAVE_DISABLED_NONBLOCKING) SET(HAVE_SOME_NONBLOCK 0) FOREACH(CURL_TEST diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 45703e6..fdcad63 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -14,6 +14,8 @@ PURPOSE. See the above copyright notices for more information. =========================================================================*/ +#include "curl/curl.h" + #include "cmCTest.h" #include "cmake.h" #include "cmMakefile.h" @@ -31,7 +33,6 @@ #include "cmCTestConfigureHandler.h" #include "cmCTestSubmit.h" -#include "curl/curl.h" #include <cmsys/RegularExpression.hxx> #include <cmsys/Process.h> |