From 7a4b4e527a9cf72b384bcfb34bfa21c88682b542 Mon Sep 17 00:00:00 2001
From: Sven van Haastregt <sven.vanhaastregt@arm.com>
Date: Wed, 6 Mar 2019 11:11:10 +0000
Subject: [PATCH] Update include paths for pre-built-LLVM builds

Translator builds with a pre-built LLVM recently broke due to headers
in the LLVM source tree no longer being found.

Update our CMake files for LLVM commit r353924 / 95decc39b55 ("[llvm]
[cmake] Provide split include paths in LLVMConfig", 2019-02-13).
---
 lib/SPIRV/CMakeLists.txt        | 2 +-
 tools/llvm-spirv/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/SPIRV/CMakeLists.txt b/lib/SPIRV/CMakeLists.txt
index 9d031687b2..b4163066be 100644
--- a/lib/SPIRV/CMakeLists.txt
+++ b/lib/SPIRV/CMakeLists.txt
@@ -44,7 +44,7 @@ add_llvm_library(LLVMSPIRVLib
 
 target_include_directories(LLVMSPIRVLib
   PRIVATE
-    ${LLVM_INCLUDE_DIR}
+    ${LLVM_INCLUDE_DIRS}
     ${LLVM_SPIRV_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/libSPIRV
diff --git a/tools/llvm-spirv/CMakeLists.txt b/tools/llvm-spirv/CMakeLists.txt
index f3a102056e..cf5541202f 100644
--- a/tools/llvm-spirv/CMakeLists.txt
+++ b/tools/llvm-spirv/CMakeLists.txt
@@ -20,6 +20,6 @@ endif()
 
 target_include_directories(llvm-spirv
   PRIVATE
-    ${LLVM_INCLUDE_DIR}
+    ${LLVM_INCLUDE_DIRS}
     ${LLVM_SPIRV_INCLUDE_DIRS}
 )