diff options
| author | Simon Kallweit <64953474+skallweitNV@users.noreply.github.com> | 2024-09-30 10:40:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-30 11:40:35 +0300 |
| commit | 67246517140cd509b6ebb36c8042783a0afb3dc9 (patch) | |
| tree | e55fda4e311d530db06988ed5df36212b1d4c2e3 | |
| parent | 24f56d0d0e00853709f9a51da593928eb3460f60 (diff) | |
Disable wgpu on linux (#5186)
* remove setting CMAKE_SYSTEM_PROCESSOR
we will need a proper toolchain file to setup cross-compilation
* disable slang-rhi webgpu backend on linux
this is a temporary fix for allowing the release workflow to run
| -rw-r--r-- | .github/workflows/release.yml | 2 | ||||
| -rw-r--r-- | external/CMakeLists.txt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9febd1f63..7cbb04f83 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -71,13 +71,11 @@ jobs: export CC=aarch64-linux-gnu-gcc export CXX=aarch64-linux-gnu-g++ fi - CMAKE_SYSTEM_PROCESSOR="${{matrix.platform}}" CMAKE_OSX_ARCHITECTURES="${{matrix.platform}}" CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES//aarch64/arm64} echo "CC=$CC" >> "$GITHUB_ENV" echo "CXX=$CXX" >> "$GITHUB_ENV" - echo "CMAKE_SYSTEM_PROCESSOR=$CMAKE_SYSTEM_PROCESSOR" >> "$GITHUB_ENV" echo "CMAKE_OSX_ARCHITECTURES=$CMAKE_OSX_ARCHITECTURES" >> "$GITHUB_ENV" - name: Build Slang diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index e37e945c6..ce8b76c70 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -71,6 +71,9 @@ set(SLANG_RHI_BINARY_DIR ${CMAKE_BINARY_DIR}/$<CONFIG>/bin) set(SLANG_RHI_SLANG_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include) set(SLANG_RHI_SLANG_BINARY_DIR ${CMAKE_BINARY_DIR}) set(SLANG_RHI_BUILD_TESTS OFF) +if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(SLANG_RHI_ENABLE_WGPU OFF) +endif() if(SLANG_ENABLE_DX_ON_VK) set(SLANG_RHI_HAS_D3D12 ON) endif() |