[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.24 1.25

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmcurl
In directory public:/mounts/ram/cvs-serv12659/Utilities/cmcurl

Modified Files:
	CMakeLists.txt 
Log Message:
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.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/CMakeLists.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** CMakeLists.txt	28 Sep 2009 15:36:09 -0000	1.24
--- CMakeLists.txt	1 Dec 2009 17:03:32 -0000	1.25
***************
*** 247,250 ****
--- 247,256 ----
  
  # 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)