summaryrefslogtreecommitdiffstats
path: root/Source/CTest/Curl/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Source/CTest/Curl/CMakeLists.txt')
-rw-r--r--Source/CTest/Curl/CMakeLists.txt44
1 files changed, 21 insertions, 23 deletions
diff --git a/Source/CTest/Curl/CMakeLists.txt b/Source/CTest/Curl/CMakeLists.txt
index 5156960..32145ff 100644
--- a/Source/CTest/Curl/CMakeLists.txt
+++ b/Source/CTest/Curl/CMakeLists.txt
@@ -361,11 +361,19 @@ MACRO(CURL_INTERNAL_TEST CURL_TEST)
ENDMACRO(CURL_INTERNAL_TEST)
# Do curl specific tests
-FOREACH(CURL_TEST
- TIME_WITH_SYS_TIME
- HAVE_O_NONBLOCK
+#OPTION(CURL_HAVE_DISABLED_NONBLOCKING "Disable non-blocking socket detection" OFF)
+SET(CURL_NONBLOCKING_TESTS)
+IF(NOT CURL_HAVE_DISABLED_NONBLOCKING)
+ SET(CURL_NONBLOCKING_TESTS
+ HAVE_FIONBIO
HAVE_IOCTLSOCKET
HAVE_IOCTLSOCKET_CASE
+ HAVE_O_NONBLOCK
+ )
+ENDIF(NOT CURL_HAVE_DISABLED_NONBLOCKING)
+FOREACH(CURL_TEST
+ ${CURL_NONBLOCKING_TESTS}
+ TIME_WITH_SYS_TIME
HAVE_O_NONBLOCKHAVE_GETHOSTBYADDR_R_5
HAVE_GETHOSTBYADDR_R_7
HAVE_GETHOSTBYADDR_R_8
@@ -461,26 +469,16 @@ 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
- HAVE_FIONBIO
- HAVE_IOCTLSOCKET
- HAVE_IOCTLSOCKET_CASE
- HAVE_O_NONBLOCK)
- IF(${CURL_TEST})
- SET(HAVE_SOME_NONBLOCK 1)
- ENDIF(${CURL_TEST})
- ENDFOREACH(CURL_TEST)
- IF(NOT HAVE_SOME_NONBLOCK)
- SET(HAVE_DISABLED_NONBLOCKING 1)
- ENDIF(NOT HAVE_SOME_NONBLOCK)
-ENDIF(CURL_HAVE_DISABLED_NONBLOCKING)
+SET(HAVE_DISABLED_NONBLOCKING 1)
+IF(HAVE_FIONBIO OR
+ HAVE_IOCTLSOCKET OR
+ HAVE_IOCTLSOCKET_CASE OR
+ HAVE_O_NONBLOCK)
+ SET(HAVE_DISABLED_NONBLOCKING)
+ENDIF(HAVE_FIONBIO OR
+ HAVE_IOCTLSOCKET OR
+ HAVE_IOCTLSOCKET_CASE OR
+ HAVE_O_NONBLOCK)
IF(RETSIGTYPE_TEST)
SET(RETSIGTYPE void)