Skip to content

Commit 885bba6

Browse files
authored
Fix setting of LKG (#365)
I somehow screwed this up and didn't catch it in my local testing on arm64 where we still don't have PR coverage. I was using the NUGET_ARCH variable before it was set.
1 parent 7453f8e commit 885bba6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

cmake/modules/Warp.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@ function(setup_warp version)
2121
return()
2222
endif()
2323

24+
guess_nuget_arch(NUGET_ARCH)
25+
2426
if (version STREQUAL "LKG")
2527
if (NUGET_ARCH STREQUAL "arm64")
2628
set(version "1.0.14.2")
2729
else()
2830
set(version "1.0.10.1")
2931
endif()
30-
set(version_description "Latest Known Good (${version})")
32+
set(version_description "Latest Known Good for ${NUGET_ARCH} (${version})")
3133
else ()
3234
set(version_description "Custom (${version})")
3335
endif()
@@ -41,8 +43,6 @@ function(setup_warp version)
4143
file(DOWNLOAD "https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/${version}/" ${WARP_ARCHIVE})
4244
endif()
4345

44-
guess_nuget_arch(NUGET_ARCH)
45-
4646
# This is all awfulness to work around the fact that the last known good WRAP
4747
# for x64 is before arm64 support was shipped via NuGet, and the packaging
4848
# changed and we just aren't allowed to have nice things.

0 commit comments

Comments
 (0)