Skip to content
This repository was archived by the owner on Oct 7, 2025. It is now read-only.

Commit cb515b2

Browse files
committed
use cage configuration; use clang; non-recursive submodules
1 parent eb04d56 commit cb515b2

File tree

6 files changed

+23
-4
lines changed

6 files changed

+23
-4
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
- name: submodules
1717
shell: bash
1818
run: |
19-
git submodule update --init --recursive --jobs 8 || echo "some submodules may have failed and it may be ok"
19+
./submodules.sh
2020
2121
- name: build
2222
shell: bash
2323
run: |
2424
root_dir=`pwd`
2525
mkdir build
2626
cd build
27-
cmake ..
27+
cmake -Tclangcl ..
2828
cmake --build . --config ${{ matrix.config }} ${paralel}
2929
cmake --install . --config ${{ matrix.config }} --prefix "${root_dir}/install"
3030
@@ -36,15 +36,18 @@ jobs:
3636

3737
Linux:
3838
name: linux
39-
runs-on: ubuntu-24.04
39+
runs-on: ubuntu-latest
40+
env:
41+
CC: clang
42+
CXX: clang++
4043

4144
steps:
4245
- uses: actions/checkout@v4
4346

4447
- name: submodules
4548
shell: bash
4649
run: |
47-
git submodule update --init --recursive --jobs 8 || echo "some submodules may have failed and it may be ok"
50+
./submodules.sh
4851
4952
- name: build
5053
shell: bash

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "dawn/dawn"]
22
path = dawn/dawn
33
url = https://dawn.googlesource.com/dawn
4+
[submodule "cage"]
5+
path = cage
6+
url = https://github.com/ucpu/cage.git

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
cmake_minimum_required(VERSION 3.31)
22
project(cagedawn LANGUAGES C CXX)
33

4+
include("cage/cmake/cage_build_configuration.cmake")
5+
cage_build_configuration()
6+
47
add_subdirectory(dawn)

DawnConfig.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ if(WIN32)
1111
else()
1212
set_target_properties(dawn_static PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/lib/libwebgpu_dawn.a")
1313
endif()
14+
15+
add_library(dawn::static ALIAS dawn_static)
16+
add_library(dawn::headers ALIAS dawn_headers)

cage

Submodule cage added at 00b51b7

submodules.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
git submodule update --init cage
4+
5+
cd dawn/dawn
6+
git submodule update --init --jobs 8 third_party

0 commit comments

Comments
 (0)