From 83fed6257e20675c7c38b412a25d363d0d88be81 Mon Sep 17 00:00:00 2001
From: Andrej730 <azhilenkov@gmail.com>
Date: Thu, 5 Feb 2026 11:57:41 +0500
Subject: [PATCH] run-cmake.bat - deduplicate cmake args code

---
 win/run-cmake.bat | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/win/run-cmake.bat b/win/run-cmake.bat
index bc6955f619..2a49a65042 100755
--- a/win/run-cmake.bat
+++ b/win/run-cmake.bat
@@ -190,21 +190,16 @@ if defined USE_NINJA (
 )
 
 IF NOT "%VS_TOOLSET_HOST%"=="" (
-    cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% %ARCH_OPTION% -T %VS_TOOLSET_HOST% ^
-              -DCMAKE_INSTALL_PREFIX="%CMAKE_INSTALL_PREFIX%" ^
-              -DWITH_ROCKSDB=On -DWITH_ZSTD=On ^
-              -DCMAKE_PREFIX_PATH="%CMAKE_PREFIX_PATH%" ^
-              -DADD_COMMIT_SHA=%ADD_COMMIT_SHA% -DVERSION_OVERRIDE=%VERSION_OVERRIDE% ^
-              %ARGUMENTS%
-) ELSE (
-    cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% %ARCH_OPTION% ^
-              -DCMAKE_INSTALL_PREFIX="%CMAKE_INSTALL_PREFIX%" ^
-              -DWITH_ROCKSDB=On -DWITH_ZSTD=On ^
-              -DCMAKE_PREFIX_PATH="%CMAKE_PREFIX_PATH%" ^
-              -DADD_COMMIT_SHA=%ADD_COMMIT_SHA% -DVERSION_OVERRIDE=%VERSION_OVERRIDE% ^
-              %ARGUMENTS%
+    set VS_TOOLSET_OPTION=-T %VS_TOOLSET_HOST%
 )
 
+cmake.exe %CMAKELISTS_DIR% -G %GENERATOR% %ARCH_OPTION% %VS_TOOLSET_OPTION% ^
+    -DCMAKE_INSTALL_PREFIX="%CMAKE_INSTALL_PREFIX%" ^
+    -DWITH_ROCKSDB=On -DWITH_ZSTD=On ^
+    -DCMAKE_PREFIX_PATH="%CMAKE_PREFIX_PATH%" ^
+    -DADD_COMMIT_SHA=%ADD_COMMIT_SHA% -DVERSION_OVERRIDE=%VERSION_OVERRIDE% ^
+    %ARGUMENTS%
+
 IF NOT %ERRORLEVEL%==0 GOTO :Error
 
 echo.