Changes to support SPIRV build on windows (llvm#1946)

- Make sure SPIRV can be referenced if it is built as an external
project
- Tweak include directories, which is also needed if SPIRV is built as
an external project

Co-authored-by: Konstantin Zhuravlyov <[email protected]>

Author: kzhuravl

amd/comgr/CMakeLists.txt

@@ -123,6 +123,12 @@ else()
         ${LLVM_EXTERNAL_LLD_SOURCE_DIR}/include
         ${LLVM_BINARY_DIR}/tools/lld/include)
   endif()
+
+  if (LLVM_EXTERNAL_SPIRV_LLVM_TRANSLATOR_SOURCE_DIR)
+    target_include_directories(amd_comgr
+      PRIVATE
+        ${LLVM_EXTERNAL_SPIRV_LLVM_TRANSLATOR_SOURCE_DIR}/include)
+  endif()
 endif()
 
 target_include_directories(amd_comgr
@@ -187,6 +193,9 @@ if(${COMGR_DISABLE_SPIRV})
   message("-- Comgr SPIRV Disabled")
 else()
   message("-- Comgr SPIRV Enabled")
+  target_include_directories(amd_comgr
+      PRIVATE
+        "${LLVM_INCLUDE_DIRS}/LLVMSPIRVLib")
 endif()
 
 

amd/comgr/src/comgr-spirv-command.cpp

@@ -17,7 +17,7 @@
 #ifndef COMGR_DISABLE_SPIRV
 #include "comgr-diagnostic-handler.h"
 
-#include <LLVMSPIRVLib/LLVMSPIRVLib.h>
+#include <LLVMSPIRVLib.h>
 #include <llvm/Bitcode/BitcodeWriter.h>
 #include <llvm/IR/LLVMContext.h>