summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-03-27 13:15:16 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-03-27 13:15:16 (GMT)
commitbd96cd5a1e935a4a7fb745996d2da4c9f0cb734d (patch)
treeb8c412cfa7859b636b620f17fa8100c0f189bff2 /Utilities
parentb6f67227f156794bc21c9cf2d6897a7e68410b67 (diff)
parent4a2ff2b7f27e569032f6c5881e17cb053b32ccc7 (diff)
downloadCMake-bd96cd5a1e935a4a7fb745996d2da4c9f0cb734d.zip
CMake-bd96cd5a1e935a4a7fb745996d2da4c9f0cb734d.tar.gz
CMake-bd96cd5a1e935a4a7fb745996d2da4c9f0cb734d.tar.bz2
Merge topic 'curl-cygwin-no-windows'
4a2ff2b7 curl: Never consider using Windows APIs on Cygwin
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/cmcurl/CMakeLists.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 08bdff5..32e4561 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -524,12 +524,18 @@ check_include_file("features.h" HAVE_FEATURES_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)
+else()
+ set(HAVE_WS2TCPIP_H 0)
+ set(HAVE_WINSOCK2_H 0)
+endif()
check_include_file_concat("stdio.h" HAVE_STDIO_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)
+else()
+ set(HAVE_WINDOWS_H 0)
+ set(HAVE_WINSOCK_H 0)
+endif()
check_include_file_concat("inttypes.h" HAVE_INTTYPES_H)
check_include_file_concat("sys/filio.h" HAVE_SYS_FILIO_H)