Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1520879 - in /apr/apr/trunk: CMakeLists.txt README.cmake
 include/apr.hwc
Date: Sun, 08 Sep 2013 16:45:17 -0000
To: commits@apr.apache.org
From: trawick@apache.org
Message-Id: <20130908164517.27132238899C@eris.apache.org>

Author: trawick
Date: Sun Sep  8 16:45:16 2013
New Revision: 1520879

URL: http://svn.apache.org/r1520879
Log:
Allow control over the setting of _WINNT_WINNT

Default minimum Windows version:
  0x0600 (Vista/Windows Server 2008)

Modified:
    apr/apr/trunk/CMakeLists.txt
    apr/apr/trunk/README.cmake
    apr/apr/trunk/include/apr.hwc

Modified: apr/apr/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr/trunk/CMakeLists.txt?rev=1520879&r1=1520878&r2=1520879&view=diff
==============================================================================
--- apr/apr/trunk/CMakeLists.txt (original)
+++ apr/apr/trunk/CMakeLists.txt Sun Sep  8 16:45:16 2013
@@ -43,8 +43,12 @@ OPTION(APU_HAVE_ODBC        "Build ODBC 
 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(LIBXML2_ICONV_INCLUDE_DIR "" CACHE STRING "Directory with iconv include files for libxml2")
-SET(LIBXML2_ICONV_LIBRARIES   "" CACHE STRING "iconv libraries to link with for libxml2")
+SET(MIN_WINDOWS_VER             "Vista" 
+    CACHE STRING "Minimum Windows version")
+SET(LIBXML2_ICONV_INCLUDE_DIR   ""
+    CACHE STRING "Directory with iconv include files for libxml2")
+SET(LIBXML2_ICONV_LIBRARIES     ""
+    CACHE STRING "iconv libraries to link with for libxml2")
 
 IF(NOT APU_USE_EXPAT AND NOT APU_USE_LIBXML2)
   MESSAGE(FATAL_ERROR "Either Expat or LibXml2 must be selected")
@@ -80,6 +84,16 @@ ELSE()
   SET(apu_use_libxml2_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)
 # "COPYONLY" just because anything else isn't implemented ;)
@@ -509,6 +523,7 @@ IF(APR_SHOW_SETTINGS)
   MESSAGE(STATUS "  DBD ODBC driver ................. : ${APU_HAVE_ODBC}")
   MESSAGE(STATUS "  Use Expat ....................... : ${APU_USE_EXPAT}")
   MESSAGE(STATUS "  Use LibXml2 ..................... : ${APU_USE_LIBXML2}")
+  MESSAGE(STATUS "  Minimum Windows version ......... : ${MIN_WINDOWS_VER}")
   MESSAGE(STATUS "  Library files for XML ........... : ${XMLLIB_LIBRARIES}")
   MESSAGE(STATUS "  Build test suite ................ : ${APR_BUILD_TESTAPR}")
   MESSAGE(STATUS "  Install private .h for httpd .... : ${APR_INSTALL_PRIVATE_H}")

Modified: apr/apr/trunk/README.cmake
URL: http://svn.apache.org/viewvc/apr/apr/trunk/README.cmake?rev=1520879&r1=1520878&r2=1520879&view=diff
==============================================================================
--- apr/apr/trunk/README.cmake (original)
+++ apr/apr/trunk/README.cmake Sun Sep  8 16:45:16 2013
@@ -89,6 +89,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
 
    LIBXML2_ICONV_INCLUDE_DIR, LIBXML2_ICONV_LIBRARIES
 

Modified: apr/apr/trunk/include/apr.hwc
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr.hwc?rev=1520879&r1=1520878&r2=1520879&view=diff
==============================================================================
--- apr/apr/trunk/include/apr.hwc (original)
+++ apr/apr/trunk/include/apr.hwc Sun Sep  8 16:45:16 2013
@@ -191,7 +191,7 @@
 #endif
 
 #ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0501
+#define _WIN32_WINNT @win32_winnt_str@
 #endif
 
 #ifndef NOUSER