From 786b6a9a3f14f3df430c3f37d49d71c6b62c6c3a Mon Sep 17 00:00:00 2001 From: magicse Date: Fri, 31 Jan 2025 21:03:55 +0200 Subject: [PATCH] Update CMakeLists.txt Autodetec win version to correct process CreateFile2 --- examples/server/CMakeLists.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/examples/server/CMakeLists.txt b/examples/server/CMakeLists.txt index 1b7cc8c13..ce0c35608 100644 --- a/examples/server/CMakeLists.txt +++ b/examples/server/CMakeLists.txt @@ -4,9 +4,23 @@ option(LLAMA_SERVER_SSL "Build SSL support for the server" OFF) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) +macro(get_WIN32_WINNT version) + if (WIN32 AND CMAKE_SYSTEM_VERSION) + set(ver ${CMAKE_SYSTEM_VERSION}) + string(REGEX MATCH "^([0-9]+).([0-9])" ver ${ver}) + string(REPLACE "." "" ver ${ver}) + string(REGEX REPLACE "([0-9])" "0\\1" ver ${ver}) + set(${version} "0x${ver}") + endif() +endmacro() + +get_WIN32_WINNT(ver) + if (MINGW) # fix: https://github.com/ggerganov/llama.cpp/actions/runs/9651004652/job/26617901362?pr=8006 - add_compile_definitions(_WIN32_WINNT=${GGML_WIN_VER}) + # add_compile_definitions(_WIN32_WINNT=${GGML_WIN_VER}) + add_definitions(-D_WIN32_WINNT=${ver}) + message(STATUS "MinGW detected, setting _WIN32_WINNT to ${ver}") endif() set(TARGET_SRCS