diff options
| author | Pierre Moreau <dev@pmoreau.org> | 2018-04-26 16:17:35 +0200 |
|---|---|---|
| committer | Alexey Sotkin <alexey.sotkin@intel.com> | 2018-05-03 17:28:33 +0300 |
| commit | 05aa9959aa583c6851b4b000c0e380f5a568d9d3 (patch) | |
| tree | 459e45e2154b1be75a14300575639d6f18f980c9 | |
| parent | b5346d8645a6a111eb07d26b53f3345636faef9c (diff) | |
Rename the installed header and install it in a prefix
Also, the version was bumped to 0.2.1 (from 0.2.0) due to the changes.
Fix: https://github.com/KhronosGroup/SPIRV-LLVM-Translator/issues/15
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | include/LLVMSPIRVLib.h (renamed from include/SPIRV.h) | 4 | ||||
| -rw-r--r-- | lib/SPIRV/OCLTypeToSPIRV.h | 2 | ||||
| -rw-r--r-- | lib/SPIRV/SPIRVInternal.h | 2 | ||||
| -rw-r--r-- | lib/SPIRV/SPIRVWriterPass.cpp | 2 | ||||
| -rw-r--r-- | tools/llvm-spirv/llvm-spirv.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 84d7197..7aced6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.3) -set(LLVM_SPIRV_VERSION 0.2.0.0) +set(LLVM_SPIRV_VERSION 0.2.1.0) # check if we build inside llvm or not if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) @@ -53,9 +53,9 @@ endif(LLVM_INCLUDE_TESTS) install( FILES - ${LLVM_SPIRV_INCLUDE_DIRS}/SPIRV.h + ${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVLib.h DESTINATION - include + ${CMAKE_INSTALL_PREFIX}/include/LLVMSPIRVLib ) get_target_property(LLVMSPIRVlib_LIBDIR LLVMSPIRVLib BINARY_DIR) diff --git a/include/SPIRV.h b/include/LLVMSPIRVLib.h index f8f695f..3bef94f 100644 --- a/include/SPIRV.h +++ b/include/LLVMSPIRVLib.h @@ -1,4 +1,4 @@ -//===- SPIRV.h - Read and write SPIR-V binary -------------------*- C++ -*-===// +//===- LLVMSPIRVLib.h - Read and write SPIR-V binary ------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -31,7 +31,7 @@ // THE SOFTWARE. // //===----------------------------------------------------------------------===// -/// \file SPIRV.h +/// \file LLVMSPIRVLib.h /// /// This files declares functions and passes for translating between LLVM and /// SPIR-V. diff --git a/lib/SPIRV/OCLTypeToSPIRV.h b/lib/SPIRV/OCLTypeToSPIRV.h index 22903cd..b63debb 100644 --- a/lib/SPIRV/OCLTypeToSPIRV.h +++ b/lib/SPIRV/OCLTypeToSPIRV.h @@ -42,7 +42,7 @@ #ifndef SPIRV_OCLTYPETOSPIRV_H #define SPIRV_OCLTYPETOSPIRV_H -#include "SPIRV.h" +#include "LLVMSPIRVLib.h" #include "llvm/IR/Function.h" #include "llvm/IR/LLVMContext.h" #include "llvm/Pass.h" diff --git a/lib/SPIRV/SPIRVInternal.h b/lib/SPIRV/SPIRVInternal.h index 1f2ebe7..99962b0 100644 --- a/lib/SPIRV/SPIRVInternal.h +++ b/lib/SPIRV/SPIRVInternal.h @@ -46,7 +46,7 @@ #include "libSPIRV/SPIRVType.h" #include "libSPIRV/SPIRVUtil.h" -#include "SPIRV.h" +#include "LLVMSPIRVLib.h" #include "llvm/IR/Attributes.h" #include "llvm/IR/Constants.h" #include "llvm/IR/Instructions.h" diff --git a/lib/SPIRV/SPIRVWriterPass.cpp b/lib/SPIRV/SPIRVWriterPass.cpp index ed029d2..56ed29d 100644 --- a/lib/SPIRV/SPIRVWriterPass.cpp +++ b/lib/SPIRV/SPIRVWriterPass.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "SPIRVWriterPass.h" -#include "SPIRV.h" +#include "LLVMSPIRVLib.h" #include "llvm/IR/Module.h" #include "llvm/IR/PassManager.h" #include "llvm/Pass.h" diff --git a/tools/llvm-spirv/llvm-spirv.cpp b/tools/llvm-spirv/llvm-spirv.cpp index cbf2e45..7b53442 100644 --- a/tools/llvm-spirv/llvm-spirv.cpp +++ b/tools/llvm-spirv/llvm-spirv.cpp @@ -64,7 +64,7 @@ #define _SPIRV_SUPPORT_TEXT_FMT #endif -#include "SPIRV.h" +#include "LLVMSPIRVLib.h" #include <fstream> #include <iostream> |