From 6b3df0577daa496361ac5ff00c63a749071e7a75 Mon Sep 17 00:00:00 2001 From: erw7 Date: Sun, 22 Mar 2020 14:41:24 +0900 Subject: [PATCH] build,cmake: fix compilation on old MinGW _WIN32_WINNT specifies the minimum version of the operating system supported by the code, so change it to the minimum version supported by libuv. If _WIN32_WINNT=0x0600, PSAPI_VERSION=1 is set and it is necessary to link psapi, so it adds psapi unconditionally to the linked library. Fixes: https://github.com/libuv/libuv/issues/2742 Refs: https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=vs-2019 PR-URL: https://github.com/libuv/libuv/pull/2748 Reviewed-By: Ben Noordhuis Reviewed-By: Jameson Nash --- CMakeLists.txt | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57833b5b..7d590a3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,22 +64,9 @@ set(uv_sources src/version.c) if(WIN32) - if (CMAKE_SYSTEM_VERSION VERSION_GREATER 10) # Windows 10 - set(windows-version 0x0A00) - elseif (CMAKE_SYSTEM_VERSION VERSION_GREATER 6.3) # Windows 8.1 - set(windows-version 0x0603) - elseif (CMAKE_SYSTEM_VERSION VERSION_GREATER 6.2) # Windows 8 - set(windows-version 0x0602) - elseif (CMAKE_SYSTEM_VERSION VERSION_GREATER 6.1) # Windows 7 - set(windows-version 0x0601) - elseif (CMAKE_SYSTEM_VERSION VERSION_GREATER 6.0) # Windows Vista - set(windows-version 0x0600) - else() - message(FATAL_ERROR "Windows Vista is the minimum version supported") - endif() - list(APPEND uv_defines WIN32_LEAN_AND_MEAN _WIN32_WINNT=${windows-version}) + list(APPEND uv_defines WIN32_LEAN_AND_MEAN _WIN32_WINNT=0x0600) list(APPEND uv_libraries - $<$:psapi> + psapi iphlpapi userenv ws2_32)