Respect NODE_ADDON_API_DIR

sparist · sparist · commit d375afbec605 · 2023-09-12T13:27:48.000-04:00
This change replaces ${DAWN_THIRD_PARTY_DIR} in target_include_directories for
relevant dawn/node targets with ${NODE_ADDON_API_DIR} and changes Napi.h to
include "napi.h" (from node-addon-api) instead of "node-addon-api/napi.h". This
required renaming "interop/Napi.h" to "interop/NodeAPI.h" to avoid a circular
include on case-insensitive file systems.

Bug: dawn:2047
diff --git a/src/dawn/node/CMakeLists.txt b/src/dawn/node/CMakeLists.txt
@@ -75,7 +75,7 @@ target_link_libraries(dawn_node dawn_node_binding dawn_node_interop dawn_native
                       libtint)
 target_include_directories(dawn_node PRIVATE
     "${PROJECT_SOURCE_DIR}"
-    "${DAWN_THIRD_PARTY_DIR}"
+    "${NODE_ADDON_API_DIR}"
     "${NODE_API_HEADERS_DIR}/include"
     "${DAWN_NODE_GEN_DIR}"
 )
diff --git a/src/dawn/node/binding/AsyncRunner.h b/src/dawn/node/binding/AsyncRunner.h
@@ -20,7 +20,7 @@
 #include <utility>
 
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 
 namespace wgpu::binding {
 
diff --git a/src/dawn/node/binding/CMakeLists.txt b/src/dawn/node/binding/CMakeLists.txt
@@ -79,7 +79,7 @@ common_compile_options(dawn_node_binding)
 target_include_directories(dawn_node_binding
     PRIVATE
         "${PROJECT_SOURCE_DIR}"
-        "${DAWN_THIRD_PARTY_DIR}"
+        "${NODE_ADDON_API_DIR}"
         "${NODE_API_HEADERS_DIR}/include"
         "${DAWN_NODE_GEN_DIR}"
 )
diff --git a/src/dawn/node/binding/Converter.h b/src/dawn/node/binding/Converter.h
@@ -25,7 +25,7 @@
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
 #include "src/dawn/node/binding/Errors.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/Errors.h b/src/dawn/node/binding/Errors.h
@@ -17,7 +17,7 @@
 
 #include <string>
 
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 
 namespace wgpu::binding {
 
diff --git a/src/dawn/node/binding/GPU.h b/src/dawn/node/binding/GPU.h
@@ -19,7 +19,7 @@
 #include "dawn/webgpu_cpp.h"
 
 #include "src/dawn/node/binding/Flags.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUAdapter.h b/src/dawn/node/binding/GPUAdapter.h
@@ -20,7 +20,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUAdapterInfo.h b/src/dawn/node/binding/GPUAdapterInfo.h
@@ -20,7 +20,7 @@
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
 
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUBindGroup.h b/src/dawn/node/binding/GPUBindGroup.h
@@ -19,7 +19,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUBindGroupLayout.h b/src/dawn/node/binding/GPUBindGroupLayout.h
@@ -19,7 +19,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUBuffer.h b/src/dawn/node/binding/GPUBuffer.h
@@ -22,7 +22,7 @@
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
 #include "src/dawn/node/binding/AsyncRunner.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUCommandBuffer.h b/src/dawn/node/binding/GPUCommandBuffer.h
@@ -19,7 +19,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUCommandEncoder.h b/src/dawn/node/binding/GPUCommandEncoder.h
@@ -19,7 +19,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUComputePassEncoder.h b/src/dawn/node/binding/GPUComputePassEncoder.h
@@ -20,7 +20,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUComputePipeline.h b/src/dawn/node/binding/GPUComputePipeline.h
@@ -19,7 +19,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUDevice.h b/src/dawn/node/binding/GPUDevice.h
@@ -20,7 +20,7 @@
 
 #include "dawn/webgpu_cpp.h"
 #include "src/dawn/node/binding/AsyncRunner.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUPipelineLayout.h b/src/dawn/node/binding/GPUPipelineLayout.h
@@ -19,7 +19,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUQuerySet.h b/src/dawn/node/binding/GPUQuerySet.h
@@ -19,7 +19,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUQueue.h b/src/dawn/node/binding/GPUQueue.h
@@ -22,7 +22,7 @@
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
 #include "src/dawn/node/binding/AsyncRunner.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPURenderBundle.h b/src/dawn/node/binding/GPURenderBundle.h
@@ -19,7 +19,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPURenderBundleEncoder.h b/src/dawn/node/binding/GPURenderBundleEncoder.h
@@ -20,7 +20,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPURenderPassEncoder.h b/src/dawn/node/binding/GPURenderPassEncoder.h
@@ -20,7 +20,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPURenderPipeline.h b/src/dawn/node/binding/GPURenderPipeline.h
@@ -19,7 +19,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUSampler.h b/src/dawn/node/binding/GPUSampler.h
@@ -19,7 +19,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUShaderModule.h b/src/dawn/node/binding/GPUShaderModule.h
@@ -21,7 +21,7 @@
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
 #include "src/dawn/node/binding/AsyncRunner.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUSupportedFeatures.h b/src/dawn/node/binding/GPUSupportedFeatures.h
@@ -21,7 +21,7 @@
 
 #include "dawn/webgpu_cpp.h"
 
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUSupportedLimits.h b/src/dawn/node/binding/GPUSupportedLimits.h
@@ -18,7 +18,7 @@
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
 
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUTexture.h b/src/dawn/node/binding/GPUTexture.h
@@ -19,7 +19,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/binding/GPUTextureView.h b/src/dawn/node/binding/GPUTextureView.h
@@ -19,7 +19,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {
diff --git a/src/dawn/node/interop/CMakeLists.txt b/src/dawn/node/interop/CMakeLists.txt
@@ -54,7 +54,7 @@ common_compile_options(dawn_node_interop)
 target_include_directories(dawn_node_interop
     PRIVATE
         "${PROJECT_SOURCE_DIR}"
-        "${DAWN_THIRD_PARTY_DIR}"
+        "${NODE_ADDON_API_DIR}"
         "${NODE_API_HEADERS_DIR}/include"
         "${DAWN_NODE_GEN_DIR}"
 )
diff --git a/src/dawn/node/interop/Core.h b/src/dawn/node/interop/Core.h
@@ -28,7 +28,7 @@
 #include <variant>
 #include <vector>
 
-#include "src/dawn/node/interop/Napi.h"
+#include "src/dawn/node/interop/NodeAPI.h"
 #include "src/dawn/node/utils/Debug.h"
 
 #define ENABLE_INTEROP_LOGGING 0  // Enable for verbose interop logging
diff --git a/src/dawn/node/interop/NodeAPI.h b/src/dawn/node/interop/NodeAPI.h
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SRC_DAWN_NODE_INTEROP_NAPI_H_
-#define SRC_DAWN_NODE_INTEROP_NAPI_H_
+#ifndef SRC_DAWN_NODE_INTEROP_NODEAPI_H_
+#define SRC_DAWN_NODE_INTEROP_NODEAPI_H_
 
 // Dawn is built with exceptions disabled.
 #define NAPI_DISABLE_CPP_EXCEPTIONS
 
-#include "node-addon-api/napi.h"
+#include "napi.h"
 
-#endif  // SRC_DAWN_NODE_INTEROP_NAPI_H_
+#endif  // SRC_DAWN_NODE_INTEROP_NODEAPI_H_

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ target_link_libraries(dawn_node dawn_node_binding dawn_node_interop dawn_native`
`75`	`75`	`libtint)`
`76`	`76`	`target_include_directories(dawn_node PRIVATE`
`77`	`77`	`"${PROJECT_SOURCE_DIR}"`
`78`		`- "${DAWN_THIRD_PARTY_DIR}"`
	`78`	`+ "${NODE_ADDON_API_DIR}"`
`79`	`79`	`"${NODE_API_HEADERS_DIR}/include"`
`80`	`80`	`"${DAWN_NODE_GEN_DIR}"`
`81`	`81`	`)`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ common_compile_options(dawn_node_binding)`
`79`	`79`	`target_include_directories(dawn_node_binding`
`80`	`80`	`PRIVATE`
`81`	`81`	`"${PROJECT_SOURCE_DIR}"`
`82`		`- "${DAWN_THIRD_PARTY_DIR}"`
	`82`	`+ "${NODE_ADDON_API_DIR}"`
`83`	`83`	`"${NODE_API_HEADERS_DIR}/include"`
`84`	`84`	`"${DAWN_NODE_GEN_DIR}"`
`85`	`85`	`)`