From 1570084d334311907c70c9179c19af8541524fff Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 3 Jan 2020 15:05:24 -0500 Subject: [PATCH] [mlir][spirv] Fix ADDITIONAL_HEADER_DIRS for SPIR-V libraries SPIRV/ headers live under mlir/Dialect/. Reviewed By: rriddle Differential Revision: https://reviews.llvm.org/D72141 --- mlir/lib/Dialect/SPIRV/CMakeLists.txt | 2 +- mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt | 2 +- mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mlir/lib/Dialect/SPIRV/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/CMakeLists.txt index e3769acee0f44..da7fd1ae75411 100644 --- a/mlir/lib/Dialect/SPIRV/CMakeLists.txt +++ b/mlir/lib/Dialect/SPIRV/CMakeLists.txt @@ -12,7 +12,7 @@ add_llvm_library(MLIRSPIRV TargetAndABI.cpp ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/SPIRV + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV ) add_dependencies(MLIRSPIRV diff --git a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt index 05a6c9cd851fb..d2dd15ae92faf 100644 --- a/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt +++ b/mlir/lib/Dialect/SPIRV/Serialization/CMakeLists.txt @@ -5,7 +5,7 @@ add_llvm_library(MLIRSPIRVSerialization TranslateRegistration.cpp ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/SPIRV + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SPIRV ) add_dependencies(MLIRSPIRVSerialization diff --git a/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt index 8316d542fa521..f9b5a5650bb11 100644 --- a/mlir/lib/Dialect/SPIRV/Transforms/CMakeLists.txt +++ b/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