diff --git a/src/dawn/CMakeLists.txt b/src/dawn/CMakeLists.txt
index 389b6b0..7d6a4f6 100644
--- a/src/dawn/CMakeLists.txt
+++ b/src/dawn/CMakeLists.txt
@@ -97,10 +97,8 @@
     PRINT_NAME "WebGPU headers"
     RESULT_VARIABLE "WEBGPU_HEADERS_GEN_SOURCES"
 )
-
-add_library(webgpu_headers STATIC ${DAWN_DUMMY_FILE})
-target_sources(webgpu_headers PRIVATE
-    ${WEBGPU_HEADERS_GEN_SOURCES}
+add_custom_target(webgpu_headers_gen
+    DEPENDS ${WEBGPU_HEADERS_GEN_SOURCES}
 )
 
 DawnJSONGenerator(
@@ -108,8 +106,6 @@
     PRINT_NAME "Emscripten WebGPU bits"
     RESULT_VARIABLE "EMSCRIPTEN_BITS_GEN_SOURCES"
 )
-
-add_library(emscripten_bits STATIC ${DAWN_DUMMY_FILE})
-target_sources(emscripten_bits PRIVATE
-    ${EMSCRIPTEN_BITS_GEN_SOURCES}
+add_custom_target(emscripten_bits_gen
+    DEPENDS ${EMSCRIPTEN_BITS_GEN_SOURCES}
 )
diff --git a/src/dawn_native/CMakeLists.txt b/src/dawn_native/CMakeLists.txt
index c2fd965..fb93f89 100644
--- a/src/dawn_native/CMakeLists.txt
+++ b/src/dawn_native/CMakeLists.txt
@@ -50,6 +50,8 @@
     "BuddyMemoryAllocator.h"
     "Buffer.cpp"
     "Buffer.h"
+    "BufferLocation.cpp"
+    "BufferLocation.h"
     "CachedObject.cpp"
     "CachedObject.h"
     "CallbackTaskManager.cpp"