ci: Add Windows SDK 26100 to msvc image
Keep older 10.0.20348.0 SDK as well. Also change: mesa_deps_test_piglit - Add CMAKE_POLICY_VERSION_MINIMUM=3.5 and _UCRT_NOISY_NAN mesa_deps_test_deqp - Add CMAKE_POLICY_VERSION_MINIMUM=3.5 and CMAKE_SYSTEM_VERSION=10.0.20348.0 meson: When building with MSVC, add -D_UCRT_NOISY_NAN to workaround Win SDK 26100 D_UCRT_NOISY_NAN is for SDK 26100 issue: https://developercommunity.visualstudio.com/t/NAN-is-no-longer-compile-time-constant-i/10688907 Reviewed-by: Pohsiang Hsu <pohhsu@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35264>
This commit is contained in:
@@ -32,7 +32,8 @@ Start-Process -NoNewWindow -Wait -FilePath C:\vs_buildtools.exe `
|
||||
"--add", "Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64", `
|
||||
"--add", "Microsoft.VisualStudio.Component.VC.Llvm.Clang", `
|
||||
"--add", "Microsoft.VisualStudio.Component.Graphics.Tools", `
|
||||
"--add", "Microsoft.VisualStudio.Component.Windows10SDK.20348"
|
||||
"--add", "Microsoft.VisualStudio.Component.Windows10SDK.20348", `
|
||||
"--add", "Microsoft.VisualStudio.Component.Windows11SDK.26100"
|
||||
|
||||
if (!$?) {
|
||||
Write-Host "Failed to install Visual Studio tools"
|
||||
|
||||
@@ -38,6 +38,8 @@ cmake -S $($deqp_source) `
|
||||
-B . `
|
||||
-GNinja `
|
||||
-DCMAKE_BUILD_TYPE=Release `
|
||||
-DCMAKE_POLICY_VERSION_MINIMUM="3.5" `
|
||||
-DCMAKE_SYSTEM_VERSION="10.0.20348.0" `
|
||||
-DDEQP_TARGET=default && `
|
||||
ninja -j32
|
||||
if (!$?) {
|
||||
|
||||
@@ -69,6 +69,8 @@ cmake -S . -B . `
|
||||
-DPIGLIT_USE_WAFFLE=ON `
|
||||
-DWaffle_INCLUDE_DIRS="$waffle_install\include\waffle-1" `
|
||||
-DWaffle_LDFLAGS="$waffle_install\lib\libwaffle-1.a" `
|
||||
-DCMAKE_POLICY_VERSION_MINIMUM="3.5" `
|
||||
-DCMAKE_C_FLAGS="-D_UCRT_NOISY_NAN=1" `
|
||||
-DGLEXT_INCLUDE_DIR="$source_dir\glext" && `
|
||||
ninja -j32
|
||||
if (!$?) {
|
||||
|
||||
Reference in New Issue
Block a user