From 8fef37b1376a3efc4ff616e0265b50f91b5af0a5 Mon Sep 17 00:00:00 2001 From: Sergey Linev Date: Mon, 31 Aug 2026 17:09:20 +0200 Subject: [PATCH] [win32] add extra patch args for civetweb If such flags not default or not configured to git, applying patch on Windows may fail. Adding "--ignore-space-change" convert patch failure just to warnings --- builtins/civetweb/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builtins/civetweb/CMakeLists.txt b/builtins/civetweb/CMakeLists.txt index 4fb8540f8ad3e..e0824a75351d5 100644 --- a/builtins/civetweb/CMakeLists.txt +++ b/builtins/civetweb/CMakeLists.txt @@ -14,9 +14,12 @@ set(ROOT_CIVETWEB_LIBRARY ${ROOT_CIVETWEB_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PRE if (NOT DEFINED GIT_EXECUTABLE) set(GIT_EXECUTABLE "git") endif() +if(WIN32) + set(GIT_PATCH_ARGS "--ignore-space-change") +endif() # check if the patch has already been applied if(NOT EXISTS "${ROOT_CIVETWEB_PREFIX}/src/BUILTIN_CIVETWEB/._patched") - set(ROOT_CIVETWEB_PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} init COMMAND ${GIT_EXECUTABLE} apply + set(ROOT_CIVETWEB_PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} init COMMAND ${GIT_EXECUTABLE} apply ${GIT_PATCH_ARGS} ${CMAKE_CURRENT_SOURCE_DIR}/1385.patch # https://github.com/civetweb/civetweb/pull/1385 ${CMAKE_CURRENT_SOURCE_DIR}/1389.patch # https://github.com/civetweb/civetweb/pull/1389 ${CMAKE_CURRENT_SOURCE_DIR}/civetweb-marker.diff)