From 00b4bbf286255269d4eaf01018bdd14959f873fd Mon Sep 17 00:00:00 2001 From: Ivan Zhakov Date: Sun, 19 May 2019 17:13:49 +0000 Subject: * CMakeLists.txt: Define _WIN32_WINNT to 0x0601 by default, since Windows 7 is minimum supported Windows version. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1859514 13f79535-47bb-0310-9956-ffa450edef68 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index b424814e3..3609d6cb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,7 @@ ELSE() ENDIF() IF("${MIN_WINDOWS_VER}" STREQUAL "") - SET(win32_winnt_str "0x0600") + SET(win32_winnt_str "0x0601") ELSEIF(${MIN_WINDOWS_VER} STREQUAL "Vista") SET(win32_winnt_str "0x0600") ELSEIF(${MIN_WINDOWS_VER} STREQUAL "Windows7") -- cgit v1.2.1 From 05975de4da961c810e0bf9d0b3552d1b3e69364f Mon Sep 17 00:00:00 2001 From: Ivan Zhakov Date: Sun, 19 May 2019 17:16:11 +0000 Subject: * CMakeLists.txt: Set MIN_WINDOWS_VER to Windows 7 by default. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1859515 13f79535-47bb-0310-9956-ffa450edef68 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 3609d6cb8..b8caa1479 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ OPTION(APR_HAVE_IPV6 "IPv6 support" ON) OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON) OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF) OPTION(TEST_STATIC_LIBS "Test programs use APR static libraries instead of shared libraries?" OFF) -SET(MIN_WINDOWS_VER "Vista" +SET(MIN_WINDOWS_VER "Windows7" CACHE STRING "Minimum Windows version") SET(LIBXML2_ICONV_INCLUDE_DIR "" CACHE STRING "Directory with iconv include files for libxml2") -- cgit v1.2.1 From f72b4a217f23b77ace61209a9b1f4ed97664f377 Mon Sep 17 00:00:00 2001 From: Ivan Zhakov Date: Sun, 19 May 2019 17:16:34 +0000 Subject: * CMakeLists.txt: Error if MIN_WINDOWS_VER set to Vista. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1859516 13f79535-47bb-0310-9956-ffa450edef68 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index b8caa1479..37e3c4359 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,7 @@ ENDIF() IF("${MIN_WINDOWS_VER}" STREQUAL "") SET(win32_winnt_str "0x0601") ELSEIF(${MIN_WINDOWS_VER} STREQUAL "Vista") - SET(win32_winnt_str "0x0600") + MESSAGE(FATAL_ERROR "Minimum supported Windows version is Windows 7/Windows Server 2008 R2") ELSEIF(${MIN_WINDOWS_VER} STREQUAL "Windows7") SET(win32_winnt_str "0x0601") ELSE() -- cgit v1.2.1