[cmake-commits] king committed CMakeLists.txt 1.11 1.12

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
COMP: Ignore windows sockets on cygwin.  Remove duplicate source entry.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmcurl/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- CMakeLists.txt	15 Mar 2007 19:22:13 -0000	1.11
+++ CMakeLists.txt	16 Mar 2007 18:28:54 -0000	1.12
@@ -93,7 +93,7 @@
   strequal.c
   strerror.c
   # strtok.c - specify later
-  strtoofft.c
+  # strtoofft.c - specify later
   telnet.c
   tftp.c
   timeval.c
@@ -219,11 +219,15 @@
 ENDMACRO(CHECK_INCLUDE_FILE_CONCAT)
 
 # Check for header files
-CHECK_INCLUDE_FILE_CONCAT("ws2tcpip.h"       HAVE_WS2TCPIP_H)
-CHECK_INCLUDE_FILE_CONCAT("winsock2.h"       HAVE_WINSOCK2_H)
+IF(NOT UNIX)
+  CHECK_INCLUDE_FILE_CONCAT("ws2tcpip.h"     HAVE_WS2TCPIP_H)
+  CHECK_INCLUDE_FILE_CONCAT("winsock2.h"     HAVE_WINSOCK2_H)
+ENDIF(NOT UNIX)
 CHECK_INCLUDE_FILE_CONCAT("stdio.h"          HAVE_STDIO_H)
-CHECK_INCLUDE_FILE_CONCAT("windows.h"        HAVE_WINDOWS_H)
-CHECK_INCLUDE_FILE_CONCAT("winsock.h"        HAVE_WINSOCK_H)
+IF(NOT UNIX)
+  CHECK_INCLUDE_FILE_CONCAT("windows.h"      HAVE_WINDOWS_H)
+  CHECK_INCLUDE_FILE_CONCAT("winsock.h"      HAVE_WINSOCK_H)
+ENDIF(NOT UNIX)
 CHECK_INCLUDE_FILE_CONCAT("stddef.h"         HAVE_STDDEF_H)
 CHECK_INCLUDE_FILE_CONCAT("sys/types.h"      HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILE_CONCAT("inttypes.h"       HAVE_INTTYPES_H)
@@ -430,6 +434,8 @@
     strtok.c
     )
 ENDIF (NOT HAVE_STRTOK_R)
+
+# only build compat strtoofft if we need to
 IF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64)
   SET(libCurl_SRCS ${libCurl_SRCS}
     strtoofft.c