diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-26 18:01:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-03-26 18:04:39 (GMT) |
| commit | 4a2ff2b7f27e569032f6c5881e17cb053b32ccc7 (patch) | |
| tree | f684721f10d144ae227bc0033443566720b466a9 /Utilities/cmcurl | |
| parent | 732d8a467ab8a295b1bbf580f865980f8a1a9b29 (diff) | |
| download | CMake-4a2ff2b7f27e569032f6c5881e17cb053b32ccc7.zip CMake-4a2ff2b7f27e569032f6c5881e17cb053b32ccc7.tar.gz CMake-4a2ff2b7f27e569032f6c5881e17cb053b32ccc7.tar.bz2 | |
curl: Never consider using Windows APIs on Cygwin
Our Windows API header checks are conditioned on if(NOT UNIX) but
libarchive checks HAVE_WINDOWS_H anyway so the result leaks into
the cache and influenes the curl build. Set the check results to
false explicitly for curl when not on Windows to tolerate this.
Reported-by: Vyacheslav Karpukhin <Vyacheslav.Karpukhin@jetbrains.com>
Diffstat (limited to 'Utilities/cmcurl')
| -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) |