[PATCH] D72141: [mlir][spirv] Fix ADDITIONAL_HEADER_DIRS for SPIR-V libraries

[Lei Zhang via Phabricator via llvm-commits]

antiagainst created this revision.
antiagainst added reviewers: mravishankar, denis13.
Herald added subscribers: llvm-commits, lucyrfox, mgester, arpith-jacob, nicolasvasilache, shauheen, burmako, jpienaar, rriddle, mehdi_amini, mgorny.
Herald added a project: LLVM.

SPIRV/ headers live under mlir/Dialect.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D72141

Files:
  mlir/lib/Dialect/SPIRV/CMakeLists.txt
  mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
  mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt


Index: mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt
+++ mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt
@@ -1,6 +1,9 @@
 add_llvm_library(MLIRSPIRVTransforms
   DecorateSPIRVCompositeTypeLayoutPass.cpp
   LowerABIAttributesPass.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
   )
 
 target_link_libraries(MLIRSPIRVTransforms
Index: mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
+++ mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt
@@ -5,7 +5,7 @@
   TranslateRegistration.cpp
 
   ADDITIONAL_HEADER_DIRS
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/SPIRV
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
   )
 
 add_dependencies(MLIRSPIRVSerialization
Index: mlir/lib/Dialect/SPIRV/CMakeLists.txt
===================================================================
--- mlir/lib/Dialect/SPIRV/CMakeLists.txt
+++ mlir/lib/Dialect/SPIRV/CMakeLists.txt
@@ -12,7 +12,7 @@
   TargetAndABI.cpp
 
   ADDITIONAL_HEADER_DIRS
-  ${MLIR_MAIN_INCLUDE_DIR}/mlir/SPIRV
+  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV
   )
 
 add_dependencies(MLIRSPIRV


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D72141.236026.patch
Type: text/x-patch
Size: 1313 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200103/a35dfe36/attachment.bin>