Fixup include directory errors in src/dawn.

This CL adds the node-addon-api prefix to the napi.h includes. This
required updating the cmake files to have the dawn_third_party_dir as
part of their includes.

Bug: dawn:1339
Change-Id: I56d9f04462d040f6ed236fcef3c4cd85a9144d7f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86241
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Dan Sinclair <dsinclair@chromium.org>
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>

src/dawn/CPPLINT.cfg

@@ -1,5 +1,4 @@
 filter=-build/header_guard
-filter=-build/include_directory
 filter=-build/include_order
 filter=-build/include_what_you_use
 filter=-build/namespaces

src/dawn/node/CMakeLists.txt

@@ -73,8 +73,8 @@ set_target_properties(dawn_node PROPERTIES
 target_link_libraries(dawn_node dawn_node_binding dawn_node_interop dawn_native dawncpp dawn_proc)
 target_include_directories(dawn_node PRIVATE
     "${CMAKE_SOURCE_DIR}"
+    "${DAWN_THIRD_PARTY_DIR}"
     "${NODE_API_HEADERS_DIR}/include"
-    "${NODE_ADDON_API_DIR}"
     "${GEN_DIR}"
 )
 

src/dawn/node/binding/AsyncRunner.h

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 
 namespace wgpu::binding {
 

src/dawn/node/binding/CMakeLists.txt

@@ -71,8 +71,8 @@ common_compile_options(dawn_node_binding)
 target_include_directories(dawn_node_binding
     PRIVATE
         "${CMAKE_SOURCE_DIR}"
+        "${DAWN_THIRD_PARTY_DIR}"
         "${NODE_API_HEADERS_DIR}/include"
-        "${NODE_ADDON_API_DIR}"
         "${GEN_DIR}"
 )
 

src/dawn/node/binding/Converter.h

@@ -20,7 +20,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/binding/Errors.h"
 #include "src/dawn/node/interop/WebGPU.h"
 

src/dawn/node/binding/Errors.h

@@ -15,7 +15,7 @@
 #ifndef DAWN_NODE_BINDING_ERRORS_H_
 #define DAWN_NODE_BINDING_ERRORS_H_
 
-#include "napi.h"
+#include "node-addon-api/napi.h"
 
 namespace wgpu::binding {
 

src/dawn/node/binding/GPU.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/binding/Flags.h"
 #include "src/dawn/node/interop/WebGPU.h"
 

src/dawn/node/binding/GPUAdapter.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUBindGroup.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUBindGroupLayout.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUBuffer.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/binding/AsyncRunner.h"
 #include "src/dawn/node/interop/WebGPU.h"
 

src/dawn/node/binding/GPUCommandBuffer.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUCommandEncoder.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUComputePassEncoder.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUComputePipeline.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUDevice.h

@@ -16,7 +16,7 @@
 #define DAWN_NODE_BINDING_GPUDEVICE_H_
 
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/binding/AsyncRunner.h"
 #include "src/dawn/node/interop/WebGPU.h"
 

src/dawn/node/binding/GPUPipelineLayout.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUQuerySet.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUQueue.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/binding/AsyncRunner.h"
 #include "src/dawn/node/interop/WebGPU.h"
 

src/dawn/node/binding/GPURenderBundle.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPURenderBundleEncoder.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPURenderPassEncoder.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPURenderPipeline.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUSampler.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUShaderModule.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/binding/AsyncRunner.h"
 #include "src/dawn/node/interop/WebGPU.h"
 

src/dawn/node/binding/GPUSupportedLimits.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUTexture.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/binding/GPUTextureView.h

@@ -17,7 +17,7 @@
 
 #include "dawn/native/DawnNative.h"
 #include "dawn/webgpu_cpp.h"
-#include "napi.h"
+#include "node-addon-api/napi.h"
 #include "src/dawn/node/interop/WebGPU.h"
 
 namespace wgpu::binding {

src/dawn/node/interop/CMakeLists.txt

@@ -52,8 +52,8 @@ common_compile_options(dawn_node_interop)
 target_include_directories(dawn_node_interop
     PRIVATE
         "${CMAKE_SOURCE_DIR}"
+        "${DAWN_THIRD_PARTY_DIR}"
         "${NODE_API_HEADERS_DIR}/include"
-        "${NODE_ADDON_API_DIR}"
         "${GEN_DIR}"
 )
 

src/dawn/node/interop/Core.h

@@ -26,7 +26,7 @@
 #include <variant>
 #include <vector>
 
-#include "napi.h"
+#include "node-addon-api/napi.h"
 
 #include "src/dawn/node/utils/Debug.h"