diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-25 14:35:27 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-25 14:36:12 (GMT) |
| commit | 5b2e68acb684fb2732c8b8d9ca43755ed257a839 (patch) | |
| tree | d5336a1b85da78043055996539e28ca374aaf738 | |
| parent | f7960e548808bc7412a1071c03ec7cb0ddd76c00 (diff) | |
| parent | 0a46eb11af88d2d50c90888c95860fa5f736f0d8 (diff) | |
| download | CMake-5b2e68acb684fb2732c8b8d9ca43755ed257a839.zip CMake-5b2e68acb684fb2732c8b8d9ca43755ed257a839.tar.gz CMake-5b2e68acb684fb2732c8b8d9ca43755ed257a839.tar.bz2 | |
Merge topic 'curl-send-recv'
0a46eb11af curl: Avoid checking 'send' and 'recv' signatures
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !4767
| -rw-r--r-- | Utilities/cmcurl/CMake/OtherTests.cmake | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Utilities/cmcurl/CMake/OtherTests.cmake b/Utilities/cmcurl/CMake/OtherTests.cmake index 8b15029..30315dc 100644 --- a/Utilities/cmcurl/CMake/OtherTests.cmake +++ b/Utilities/cmcurl/CMake/OtherTests.cmake @@ -26,6 +26,13 @@ endif() set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) +if(1) # CMake hard-codes these + set(RECV_TYPE_ARG1 "curl_socket_t") + set(RECV_TYPE_ARG2 "char *") + set(RECV_TYPE_ARG3 "size_t") + set(RECV_TYPE_ARG4 "int") + set(RECV_TYPE_RETV "ssize_t") +else() check_c_source_compiles("${_source_epilogue} int main(void) { recv(0, 0, 0, 0); @@ -88,8 +95,17 @@ else() message(FATAL_ERROR "Unable to link function recv") endif() set(curl_cv_func_recv_args "${curl_cv_func_recv_args}" CACHE INTERNAL "Arguments for recv") +endif() set(HAVE_RECV 1) +if(1) # CMake hard-codes these + set(SEND_QUAL_ARG2 " ") + set(SEND_TYPE_ARG1 "curl_socket_t") + set(SEND_TYPE_ARG2 "char *") + set(SEND_TYPE_ARG3 "size_t") + set(SEND_TYPE_ARG4 "int") + set(SEND_TYPE_RETV "ssize_t") +else() check_c_source_compiles("${_source_epilogue} int main(void) { send(0, 0, 0, 0); @@ -156,6 +172,7 @@ else() message(FATAL_ERROR "Unable to link function send") endif() set(curl_cv_func_send_args "${curl_cv_func_send_args}" CACHE INTERNAL "Arguments for send") +endif() set(HAVE_SEND 1) check_c_source_compiles("${_source_epilogue} |