You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2013/09/08 18:58:36 UTC
svn commit: r1520880 - in /apr/apr/branches/1.4.x: ./ CMakeLists.txt
README.cmake include/apr.hwc
Author: trawick
Date: Sun Sep 8 16:58:36 2013
New Revision: 1520880
URL: http://svn.apache.org/r1520880
Log:
merge r15207=879 from trunk:
Allow control over the setting of _WINNT_WINNT
Default minimum Windows version:
0x0600 (Vista/Windows Server 2008)
Modified:
apr/apr/branches/1.4.x/ (props changed)
apr/apr/branches/1.4.x/CMakeLists.txt
apr/apr/branches/1.4.x/README.cmake
apr/apr/branches/1.4.x/include/apr.hwc
Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1520879
Modified: apr/apr/branches/1.4.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CMakeLists.txt?rev=1520880&r1=1520879&r2=1520880&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CMakeLists.txt (original)
+++ apr/apr/branches/1.4.x/CMakeLists.txt Sun Sep 8 16:58:36 2013
@@ -23,6 +23,8 @@ OPTION(APR_INSTALL_PRIVATE_H "Install s
OPTION(APR_HAVE_IPV6 "IPv6 support" ON)
OPTION(APR_SHOW_SETTINGS "Show the build configuration" ON)
OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF)
+SET(MIN_WINDOWS_VER "Vista"
+ CACHE STRING "Minimum Windows version")
# create 1-or-0 representation of feature tests for apr.h
@@ -32,6 +34,16 @@ IF(APR_HAVE_IPV6)
SET(apr_have_ipv6_10 1)
ENDIF()
+IF("${MIN_WINDOWS_VER}" STREQUAL "")
+ SET(win32_winnt_str "0x0600")
+ELSEIF(${MIN_WINDOWS_VER} STREQUAL "Vista")
+ SET(win32_winnt_str "0x0600")
+ELSEIF(${MIN_WINDOWS_VER} STREQUAL "Windows7")
+ SET(win32_winnt_str "0x0601")
+ELSE()
+ SET(win32_winnt_str ${MIN_WINDOWS_VER})
+ENDIF()
+
CONFIGURE_FILE(include/apr.hwc
${PROJECT_BINARY_DIR}/apr.h)
@@ -312,6 +324,7 @@ IF(APR_SHOW_SETTINGS)
MESSAGE(STATUS " Install prefix .................. : ${CMAKE_INSTALL_PREFIX}")
MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}")
MESSAGE(STATUS " IPv6 ............................ : ${APR_HAVE_IPV6}")
+ MESSAGE(STATUS " Minimum Windows version ......... : ${MIN_WINDOWS_VER}")
MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}")
MESSAGE(STATUS " Install private .h for httpd .... : ${APR_INSTALL_PRIVATE_H}")
ENDIF(APR_SHOW_SETTINGS)
Modified: apr/apr/branches/1.4.x/README.cmake
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/README.cmake?rev=1520880&r1=1520879&r2=1520880&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/README.cmake (original)
+++ apr/apr/branches/1.4.x/README.cmake Sun Sep 8 16:58:36 2013
@@ -63,6 +63,15 @@ How to build
Default: ON
APR_BUILD_TESTAPR Build APR test suite
Default: OFF
+ MIN_WINDOWS_VER Minimum Windows version supported by this build
+ (This controls the setting of _WIN32_WINNT.)
+ "Vista" or "Windows7" or a numeric value like
+ "0x0601"
+ Default: "Vista"
+ For desktop/server equivalence or other values,
+ refer to
+ http://msdn.microsoft.com/en-us/library/windows/
+ desktop/aa383745(v=vs.85).aspx
CMAKE_C_FLAGS_RELEASE, _DEBUG, _RELWITHDEBINFO, _MINSIZEREL
Modified: apr/apr/branches/1.4.x/include/apr.hwc
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr.hwc?rev=1520880&r1=1520879&r2=1520880&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr.hwc (original)
+++ apr/apr/branches/1.4.x/include/apr.hwc Sun Sep 8 16:58:36 2013
@@ -81,10 +81,7 @@
#define WIN32_LEAN_AND_MEAN
#endif
#ifndef _WIN32_WINNT
-
-/* Restrict the server to a subset of Windows XP header files by default
- */
-#define _WIN32_WINNT 0x0501
+#define _WIN32_WINNT @win32_winnt_str@
#endif
#ifndef NOUSER
#define NOUSER