diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-26 18:04:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-03-26 18:04:44 (GMT) |
| commit | 94d3988c3f75e41b750092a76c01713dc25d33fd (patch) | |
| tree | 73e99dd3e278cb37e7d95c32ece39c84f0d9381c | |
| parent | d449ec2f28ff5791a53e694a766cea75f5e1bb44 (diff) | |
| parent | 4a2ff2b7f27e569032f6c5881e17cb053b32ccc7 (diff) | |
| download | CMake-94d3988c3f75e41b750092a76c01713dc25d33fd.zip CMake-94d3988c3f75e41b750092a76c01713dc25d33fd.tar.gz CMake-94d3988c3f75e41b750092a76c01713dc25d33fd.tar.bz2 | |
Merge branch 'curl-cygwin-no-windows' into release
| -rw-r--r-- | Utilities/cmcurl/CMakeLists.txt | 10 |
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) |