From 997fd839ed3186f5578dff118b9519eaea5b66bc Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 1 Dec 2009 12:03:32 -0500 Subject: curl: Hard-code HAVE_W* macros on UNIX for Cygwin The curl library code assumes that HAVE_WINDOWS_H and similar macros are not defined on Cygwin. Its CMake code achieved this by not even testing for the corresponding headers on UNIX platforms. However, libarchive does test HAVE_WINDOWS_H and confuses our curl build. We avoid the conflict by hard-coding the macros to 0 for UNIX builds inside the curl tree. --- Utilities/cmcurl/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index e2c64db..2a8a616 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -246,6 +246,12 @@ MACRO(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE) ENDMACRO(CHECK_INCLUDE_FILE_CONCAT) # Check for header files +IF(UNIX) + SET(HAVE_WINDOWS_H 0) + SET(HAVE_WINSOCK_H 0) + SET(HAVE_WS2TCPIP_H 0) + SET(HAVE_WINSOCK2_H 0) +ENDIF(UNIX) IF(NOT UNIX) CHECK_INCLUDE_FILE_CONCAT("ws2tcpip.h" HAVE_WS2TCPIP_H) CHECK_INCLUDE_FILE_CONCAT("winsock2.h" HAVE_WINSOCK2_H) -- cgit v0.12