summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-12-01 17:03:32 (GMT)
committerBrad King <brad.king@kitware.com>2009-12-01 17:03:32 (GMT)
commit997fd839ed3186f5578dff118b9519eaea5b66bc (patch)
tree9a9997ff98e9a8d0927c3c9eb7847bfa01588cf7 /Utilities
parent7380d3ab7c6a378040da8aa86d770694bbf114d0 (diff)
downloadCMake-997fd839ed3186f5578dff118b9519eaea5b66bc.zip
CMake-997fd839ed3186f5578dff118b9519eaea5b66bc.tar.gz
CMake-997fd839ed3186f5578dff118b9519eaea5b66bc.tar.bz2
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.
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/cmcurl/CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
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)