[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 109/208: cmake: if inet_pton is used, bump _WIN32_W
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 109/208: cmake: if inet_pton is used, bump _WIN32_WINNT |
Date: |
Wed, 09 Aug 2017 17:35:06 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.
commit 9ee6cb1b77c7a9a17c5ce380cec72066e13b1ebf
Author: Daniel Stenberg <address@hidden>
AuthorDate: Wed Jul 5 10:21:58 2017 +0200
cmake: if inet_pton is used, bump _WIN32_WINNT
... and make sure inet_pton is always checked for when *not* using Windows,
which is a regression from 4fc6ebe18.
Idea-by: Sergei Nikulov
---
CMakeLists.txt | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 727ca8153..5d8b9f10f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -932,8 +932,17 @@ check_symbol_exists(ioctl "${CURL_INCLUDES}"
HAVE_IOCTL)
check_symbol_exists(setsockopt "${CURL_INCLUDES}" HAVE_SETSOCKOPT)
# symbol exists in win32, but function does not.
-if(ENABLE_INET_PTON)
- check_function_exists(inet_pton HAVE_INET_PTON)
+if(WIN32)
+ if(ENABLE_INET_PTON)
+ check_function_exists(inet_pton HAVE_INET_PTON)
+ # _WIN32_WINNT_VISTA (0x0600)
+ add_definitions(-D_WIN32_WINNT=0x0600)
+ else()
+ # _WIN32_WINNT_WINXP (0x0501)
+ add_definitions(-D_WIN32_WINNT=0x0501)
+ endif()
+else()
+ check_function_exists(inet_pton HAVE_INET_PTON)
endif()
check_symbol_exists(fsetxattr "${CURL_INCLUDES}" HAVE_FSETXATTR)
@@ -1136,11 +1145,6 @@ include(CMake/OtherTests.cmake)
add_definitions(-DHAVE_CONFIG_H)
-# For windows, do not allow the compiler to use default target (Vista).
-if(WIN32)
- add_definitions(-D_WIN32_WINNT=0x0501)
-endif(WIN32)
-
# For windows, all compilers used by cmake should support large files
if(WIN32)
set(USE_WIN32_LARGE_FILES ON)
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 57/208: lib1521: fix missing-variable-declarations clang warnings, (continued)
- [GNUnet-SVN] [gnurl] 57/208: lib1521: fix missing-variable-declarations clang warnings, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 88/208: cmake: Added compatibility options for older Windows versions, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 100/208: smb: fix build for djgpp/MSDOS, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 105/208: TODO: HTTP proxy CONNECT is non-blocking now, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 91/208: url: make the original string get used on subsequent transfers, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 119/208: travis: do more tests in the coverage run, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 122/208: cmake: offer CMAKE_DEBUG_POSTFIX when building with MSVC, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 108/208: select.h: avoid macro redefinition harder, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 128/208: tool_cb_wrt: fix variable shadowing warning, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 127/208: RELEASE-NOTES: synced with be2c999b8, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 109/208: cmake: if inet_pton is used, bump _WIN32_WINNT,
gnunet <=
- [GNUnet-SVN] [gnurl] 25/208: tests: stabilize test 2032 and 2033, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 141/208: system.h: include winsock2.h before windows.h, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 46/208: mkhelp.pl: fix script name in usage text, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 124/208: travis: detect and use valgrind for normal builds, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 140/208: build: remove WIN32_LEAN_AND_MEAN from individual build systems, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 118/208: curl_easy_escape.3: mention the (lack of) encoding, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 134/208: make: fix docs build on OpenBSD, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 114/208: cmake: remove spurious "-l" from linker flags, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 45/208: RELEASE-NOTES: synced with 3b80d3ca4, gnunet, 2017/08/09
- [GNUnet-SVN] [gnurl] 75/208: CURLOPT_SOCKS5_AUTH: allowed methods for SOCKS5 proxy auth, gnunet, 2017/08/09