This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via a7fe79c03a8036edbb998809bd339cce2a0ac3f8 (commit) via 4a2ff2b7f27e569032f6c5881e17cb053b32ccc7 (commit) from 5914c8133421a27f07e6c3d8a1112318cd163df3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7fe79c03a8036edbb998809bd339cce2a0ac3f8 commit a7fe79c03a8036edbb998809bd339cce2a0ac3f8 Merge: 5914c81 4a2ff2b Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Mar 26 14:07:34 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Mar 26 14:07:34 2015 -0400 Merge topic 'curl-cygwin-no-windows' into next 4a2ff2b7 curl: Never consider using Windows APIs on Cygwin http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a2ff2b7f27e569032f6c5881e17cb053b32ccc7 commit 4a2ff2b7f27e569032f6c5881e17cb053b32ccc7 Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Mar 26 14:01:03 2015 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Mar 26 14:04:39 2015 -0400 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.karpuk...@jetbrains.com> 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) ----------------------------------------------------------------------- Summary of changes: Utilities/cmcurl/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits