encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CMake build failures after recent changes 

- https://dawn-review.googlesource.com/c/dawn/+/62580
  Don't add_library for targets that just generate files.
- https://dawn-review.googlesource.com/c/dawn/+/64420
  Add missing file.

Build tested locally, on macOS (only).

Bug: dawn:1080, dawn:809
Change-Id: Ia07d040dd5d3f57aa422765270c961ea6e79e3cd
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/64702
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Auto-Submit: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
Kai Ninomiya 2021-09-21 01:07:35 +00:00 committed by Dawn LUCI CQ
parent 73d7c841fd
commit 92d6e53e6d
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dawn/CMakeLists.txt
View File

@ -97,10 +97,8 @@ DawnJSONGenerator(
PRINT_NAME "WebGPU headers" PRINT_NAME "WebGPU headers"
RESULT_VARIABLE "WEBGPU_HEADERS_GEN_SOURCES" RESULT_VARIABLE "WEBGPU_HEADERS_GEN_SOURCES"
) )
add_custom_target(webgpu_headers_gen
add_library(webgpu_headers STATIC ${DAWN_DUMMY_FILE}) DEPENDS ${WEBGPU_HEADERS_GEN_SOURCES}
target_sources(webgpu_headers PRIVATE
${WEBGPU_HEADERS_GEN_SOURCES}
) )
DawnJSONGenerator( DawnJSONGenerator(
@ -108,8 +106,6 @@ DawnJSONGenerator(
PRINT_NAME "Emscripten WebGPU bits" PRINT_NAME "Emscripten WebGPU bits"
RESULT_VARIABLE "EMSCRIPTEN_BITS_GEN_SOURCES" RESULT_VARIABLE "EMSCRIPTEN_BITS_GEN_SOURCES"
) )
add_custom_target(emscripten_bits_gen
add_library(emscripten_bits STATIC ${DAWN_DUMMY_FILE}) DEPENDS ${EMSCRIPTEN_BITS_GEN_SOURCES}
target_sources(emscripten_bits PRIVATE
${EMSCRIPTEN_BITS_GEN_SOURCES}
) )

2
src/dawn_native/CMakeLists.txt
View File

@ -50,6 +50,8 @@ target_sources(dawn_native PRIVATE
"BuddyMemoryAllocator.h" "BuddyMemoryAllocator.h"
"Buffer.cpp" "Buffer.cpp"
"Buffer.h" "Buffer.h"
"BufferLocation.cpp"
"BufferLocation.h"
"CachedObject.cpp" "CachedObject.cpp"
"CachedObject.h" "CachedObject.h"
"CallbackTaskManager.cpp" "CallbackTaskManager.cpp"