Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-05 23:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ifcviewer-wgpu: pick the Windows ARM64 wgpu-native archive when targeting ARM64

Browse Source 
The Windows branch of the wgpu-native FetchContent block was
hardcoding the x86_64 archive name regardless of host arch — the
macOS and Linux branches already switch on
\`CMAKE_SYSTEM_PROCESSOR MATCHES "arm64|aarch64"\`, but Windows
didn't get the same treatment because the wgpu work was done on
x86_64 hosts.

Result on \`windows-11-arm\`: CMake downloaded
\`wgpu-windows-x86_64-msvc-release.zip\`, IfcViewerWgpu linked against
the x86_64 import library, and the final link of
IfcViewerWgpuMinimal/BonsaiViewer emitted ~60 unresolved \`wgpu*\`
externs because the import-lib symbols are x86_64-only.

Upstream wgpu-native v29.0.0.0 already publishes
\`wgpu-windows-aarch64-msvc-release.zip\` — switching on
\`CMAKE_SYSTEM_PROCESSOR\` so the right archive gets fetched is
sufficient.

Also restores the ARM64 row in \`.github/workflows/build_win.yml\`
that the prior commit dropped (the comment there was wrong; upstream
does ship the binary, our CMake just wasn't asking for it).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Dion Moult
2026-06-02 10:13:01 +10:00
parent 6fa55b7c25
commit 1b920e502f
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build_win.yml
+6 -5
View File
@@ -16,11 +16,12 @@ jobs:
build_branch: windows-x64 build_branch: windows-x64
zip_suffix: win64 zip_suffix: win64
# ARM64 dropped while BonsaiViewer is on: wgpu-native does not - arch: ARM64
# ship a Windows-ARM64 binary, so IfcViewerWgpu's link step fails runs_on: windows-11-arm
# with ~60 unresolved wgpu* externs. Re-enable when upstream deps_dir: _deps-vs2022-ARM64-installed
# publishes that target (or when we add ARM64 to the wgpu-native vcvars: '"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsarm64.bat"'
# FetchContent URL allowlist). build_branch: windows-arm64
zip_suffix: win-arm64
runs-on: ${{ matrix.runs_on }} runs-on: ${{ matrix.runs_on }}
src/ifcviewer-wgpu/CMakeLists.txt
+5 -1
View File
@@ -32,7 +32,11 @@ set(WGPU_NATIVE_VERSION "v29.0.0.0" CACHE STRING "wgpu-native release tag")
# Pick the right release archive for the host platform. # Pick the right release archive for the host platform.
if(CMAKE_SYSTEM_NAME STREQUAL "Windows") if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
set(_wgpu_archive "wgpu-windows-x86_64-msvc-release.zip") if(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64|aarch64")
set(_wgpu_archive "wgpu-windows-aarch64-msvc-release.zip")
else()
set(_wgpu_archive "wgpu-windows-x86_64-msvc-release.zip")
endif()
set(_wgpu_lib "wgpu_native.dll.lib") set(_wgpu_lib "wgpu_native.dll.lib")
set(_wgpu_runtime "wgpu_native.dll") set(_wgpu_runtime "wgpu_native.dll")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")