kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: Ignore windows sockets on cygwin. Remove duplicate source entry.

This commit is contained in:
Brad King 2007-03-16 14:28:54 -04:00
parent 1f639ee76c
commit 0a1d660242
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Utilities/cmcurl/CMakeLists.txt
View File

@ -93,7 +93,7 @@ SET(libCurl_SRCS
strequal.c strequal.c
strerror.c strerror.c
# strtok.c - specify later # strtok.c - specify later
strtoofft.c # strtoofft.c - specify later
telnet.c telnet.c
tftp.c tftp.c
timeval.c timeval.c
@ -219,11 +219,15 @@ MACRO(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE)
ENDMACRO(CHECK_INCLUDE_FILE_CONCAT) ENDMACRO(CHECK_INCLUDE_FILE_CONCAT)
# Check for header files # Check for header files
CHECK_INCLUDE_FILE_CONCAT("ws2tcpip.h" HAVE_WS2TCPIP_H) IF(NOT UNIX)
CHECK_INCLUDE_FILE_CONCAT("winsock2.h" HAVE_WINSOCK2_H) 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("stdio.h" HAVE_STDIO_H)
CHECK_INCLUDE_FILE_CONCAT("windows.h" HAVE_WINDOWS_H) IF(NOT UNIX)
CHECK_INCLUDE_FILE_CONCAT("winsock.h" HAVE_WINSOCK_H) 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("stddef.h" HAVE_STDDEF_H)
CHECK_INCLUDE_FILE_CONCAT("sys/types.h" HAVE_SYS_TYPES_H) CHECK_INCLUDE_FILE_CONCAT("sys/types.h" HAVE_SYS_TYPES_H)
CHECK_INCLUDE_FILE_CONCAT("inttypes.h" HAVE_INTTYPES_H) CHECK_INCLUDE_FILE_CONCAT("inttypes.h" HAVE_INTTYPES_H)
@ -430,6 +434,8 @@ IF (NOT HAVE_STRTOK_R)
strtok.c strtok.c
) )
ENDIF (NOT HAVE_STRTOK_R) ENDIF (NOT HAVE_STRTOK_R)
# only build compat strtoofft if we need to
IF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64) IF(NOT HAVE_STRTOLL AND NOT HAVE__STRTOI64)
SET(libCurl_SRCS ${libCurl_SRCS} SET(libCurl_SRCS ${libCurl_SRCS}
strtoofft.c strtoofft.c