Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-09 09:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: add patch for mpir build script to fix failing build when VS2026 is installed

Browse Source
This commit is contained in:
Josef Wienerroither
2026-01-16 12:13:24 +01:00
parent 6f871fb13b
commit 55c2deea37
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/build-deps-ifcmax.cmd
+4
View File
@@ -324,6 +324,10 @@ powershell -c "get-content %~dp0patches\mpir.patch | %%{$_ -replace \"sdk\",\"%U
IF NOT %ERRORLEVEL%==0 GOTO :Error
if NOT "%USE_STATIC_RUNTIME%"=="FALSE" git apply "%~dp0patches\mpir_runtime.patch" --unidiff-zero --ignore-whitespace
IF NOT %ERRORLEVEL%==0 GOTO :Error
REM patch to force build using VS2022, in case VS2026 is installed, which currently fails to build mpir
git apply "%~dp0patches\mpir_build.patch" --unidiff-zero --ignore-whitespace
IF NOT %ERRORLEVEL%==0 GOTO :Error
cd msvc
cd vs%VS_VER:~2,2%
call .\msbuild.bat gc LIB %VS_PLATFORM% %DEBUG_OR_RELEASE%
win/patches/mpir_build.patch
+14
View File
@@ -0,0 +1,14 @@
diff --git a/msvc/vs22/msbuild.bat b/msvc/vs22/msbuild.bat
index f119c3e9..35e46217 100644
--- a/msvc/vs22/msbuild.bat
+++ b/msvc/vs22/msbuild.bat
@@ -14,7 +14,8 @@ set vs_version=2019
set vsw_exe="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
-for /f "usebackq tokens=*" %%i in (`"!vsw_exe!" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do (
+rem limit to VS2022, as VS2026 does not build currently
+for /f "usebackq tokens=*" %%i in (`"!vsw_exe! -version [17,18)" -sort -products * -requires Microsoft.Component.MSBuild -property installationPath`) do (
set InstallDir=%%i
)