Skip to content

Commit a45b7a5

Browse files
committed
MSYS2
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent 6058124 commit a45b7a5

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

cmake/FindCAres.cmake

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,16 @@ if(NOT CAres_FOUND)
156156
endif()
157157

158158
# Generate configuration headers
159-
if(WIN32)
159+
if(WIN32 AND HYDRA_COMPILER_MSVC)
160160
set(CARES_TYPEOF_ARES_SOCKLEN_T "int")
161161
set(CARES_TYPEOF_ARES_SSIZE_T "SSIZE_T")
162162
else()
163163
set(CARES_TYPEOF_ARES_SOCKLEN_T "socklen_t")
164164
set(CARES_TYPEOF_ARES_SSIZE_T "ssize_t")
165165
endif()
166166

167-
# Socket function type definitions for Unix
168-
if(UNIX)
167+
# Socket function type definitions for Unix and Unix-like (MSYS2)
168+
if(UNIX OR (WIN32 AND NOT HYDRA_COMPILER_MSVC))
169169
set(RECV_TYPE_ARG1 "int")
170170
set(RECV_TYPE_ARG2 "void *")
171171
set(RECV_TYPE_ARG3 "size_t")
@@ -188,7 +188,7 @@ if(NOT CAres_FOUND)
188188
set(GETNAMEINFO_TYPE_ARG2 "socklen_t")
189189
set(GETNAMEINFO_TYPE_ARG46 "size_t")
190190
set(GETNAMEINFO_TYPE_ARG7 "int")
191-
elseif(WIN32)
191+
elseif(WIN32 AND HYDRA_COMPILER_MSVC)
192192
set(RECV_TYPE_ARG1 "SOCKET")
193193
set(RECV_TYPE_ARG2 "char *")
194194
set(RECV_TYPE_ARG3 "int")
@@ -225,12 +225,13 @@ if(NOT CAres_FOUND)
225225
endif()
226226

227227
# Platform-specific defines
228-
if(UNIX)
228+
if(UNIX OR (WIN32 AND NOT HYDRA_COMPILER_MSVC))
229229
if(NOT APPLE)
230230
target_compile_definitions(cares PRIVATE _POSIX_C_SOURCE=199309L)
231231
endif()
232232
target_compile_definitions(cares PRIVATE HAVE_SYS_TIME_H)
233233
target_compile_definitions(cares PRIVATE HAVE_TIME_H)
234+
target_compile_definitions(cares PRIVATE HAVE_SYS_SELECT_H)
234235
target_compile_definitions(cares PRIVATE HAVE_STRUCT_TIMEVAL)
235236
target_compile_definitions(cares PRIVATE HAVE_STRUCT_SOCKADDR_IN6)
236237
target_compile_definitions(cares PRIVATE HAVE_STRUCT_ADDRINFO)
@@ -258,7 +259,7 @@ if(NOT CAres_FOUND)
258259
target_compile_definitions(cares PRIVATE HAVE_GETTIMEOFDAY)
259260
target_compile_definitions(cares PRIVATE HAVE_CLOCK_GETTIME_MONOTONIC)
260261
target_compile_definitions(cares PRIVATE HAVE_STDINT_H)
261-
elseif(WIN32)
262+
elseif(WIN32 AND HYDRA_COMPILER_MSVC)
262263
target_compile_definitions(cares PRIVATE HAVE_WINDOWS_H)
263264
target_compile_definitions(cares PRIVATE HAVE_WINSOCK2_H)
264265
target_compile_definitions(cares PRIVATE HAVE_WS2TCPIP_H)

0 commit comments

Comments
 (0)