diff --git a/win/build-deps.cmd b/win/build-deps.cmd
index 630e166ff2..ab2d0ac6a6 100644
--- a/win/build-deps.cmd
+++ b/win/build-deps.cmd
@@ -572,15 +572,21 @@ IF NOT %ERRORLEVEL%==0 GOTO :Error
 
 
 :SWIG
+set DEPENDENCY_NAME=SWIG
+set SWIG_VERSION=4.1.0
+set DEPENDENCY_DIR=%DEPS_DIR%\swig-%SWIG_VERSION%
+set DEPENDENCY_INSTALL_DIR=%INSTALL_DIR%\swig-%SWIG_VERSION%
+echo SWIG_INSTALL_DIR=%DEPENDENCY_INSTALL_DIR%>>"%~dp0\%BUILD_DEPS_CACHE_PATH%"
 
-IF EXIST "%INSTALL_DIR%\swigwin" (
-    echo Found existing "%INSTALL_DIR%\swigwin", skipping
+IF EXIST "%DEPENDENCY_INSTALL_DIR%" (
+    echo Found existing "%DEPENDENCY_INSTALL_DIR%", skipping
     goto :cgal
 )
 
 cd "%DEPS_DIR%"
 
 :: Install bizon dependency for SWIG.
+set SWIG_DEPENDENCY_NAME=%DEPENDENCY_NAME%
 set DEPENDENCY_NAME=win_flex_bison
 set WIN_FLEX_BIZON=win_flex_bison-2.5.25
 set WIN_FLEX_BIZON_ZIP=%WIN_FLEX_BIZON%.zip
@@ -589,10 +595,8 @@ IF NOT %ERRORLEVEL%==0 GOTO :Error
 echo test %WIN_FLEX_BIZON%
 call :ExtractArchive %WIN_FLEX_BIZON_ZIP% "%DEPS_DIR%\%WIN_FLEX_BIZON%" "%DEPS_DIR%\%WIN_FLEX_BIZON%"
 IF NOT %ERRORLEVEL%==0 GOTO :Error
+set DEPENDENCY_NAME=%SWIG_DEPENDENCY_NAME%
 
-set SWIG_VERSION=4.1.0
-set DEPENDENCY_NAME=SWIG %SWIG_VERSION%
-set DEPENDENCY_DIR=%DEPS_DIR%\swig-%SWIG_VERSION%
 set SWIG_ZIP=swigwin-%SWIG_VERSION%.zip
 call :DownloadFile https://github.com/swig/swig/archive/refs/tags/v%SWIG_VERSION%.zip "%DEPS_DIR%" swig-%SWIG_VERSION%.zip
 IF NOT %ERRORLEVEL%==0 GOTO :Error
@@ -601,7 +605,7 @@ call :ExtractArchive swig-%SWIG_VERSION%.zip "%DEPS_DIR%" "%DEPENDENCY_DIR%"
 IF NOT %ERRORLEVEL%==0 GOTO :Error
 cd "%DEPENDENCY_DIR%"
 
-call :RunCMake -DCMAKE_INSTALL_PREFIX="%INSTALL_DIR%\swigwin" ^
+call :RunCMake -DCMAKE_INSTALL_PREFIX="%DEPENDENCY_INSTALL_DIR%" ^
                -DWITH_PCRE=OFF ^
                -DBISON_EXECUTABLE="%DEPS_DIR%\%WIN_FLEX_BIZON%\win_bison.exe"
 IF NOT %ERRORLEVEL%==0 GOTO :Error
diff --git a/win/run-cmake.bat b/win/run-cmake.bat
index d250161407..7c121ef3df 100755
--- a/win/run-cmake.bat
+++ b/win/run-cmake.bat
@@ -99,7 +99,9 @@ for /f "usebackq delims=" %%v in (`
 set PYTHON_INCLUDE_DIR=%PYTHONHOME%\include
 set PYTHON_LIBRARY=%PYTHONHOME%\libs\python%PY_VER_MAJOR_MINOR%.lib
 
-set SWIG_INSTALL_DIR=%INSTALL_DIR%\swigwin
+:: `swigwin` is a legacy installation folder name, before we started using versioned folders.
+:: we can remove it later.
+if not defined SWIG_INSTALL_DIR set SWIG_INSTALL_DIR=%INSTALL_DIR%\swigwin
 set JSON_INCLUDE_DIR=%INSTALL_DIR%\json
 if not defined ADD_COMMIT_SHA set ADD_COMMIT_SHA=Off