Skip to content

[CMake] Move headers to include/LLVMSPIRVLib to match install layout #3581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wenju-he wants to merge 7 commits into
base: main
Choose a base branch
from
Open

[CMake] Move headers to include/LLVMSPIRVLib to match install layout #3581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ab72766
[CMake] Copy headers to build directory for in-tree consistency
wenju-he Feb 16, 2026
42fd789
[CMake] Move headers to include/LLVMSPIRVLib in source tree
wenju-he Feb 16, 2026
321c889
Merge branch 'main' into copy-header-to-build-dir
wenju-he Feb 16, 2026
a6eb9da
[CMake] Remove redundant include directory from llvm-spirv tool
wenju-he Feb 16, 2026
dbf49b4
[CMake] Remove redundant INSTALL_INTERFACE from target include direct…
wenju-he Feb 16, 2026
5ee6bdd
[CMake] Revert BUILD_INTERFACE changes for separate PR
wenju-he Feb 17, 2026
b6e416b
Merge branch 'main' into copy-header-to-build-dir
wenju-he Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@ endif(LLVM_SPIRV_INCLUDE_TESTS)

install(
FILES
${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVLib.h
${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVOpts.h
${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVExtensions.inc
${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVLib/LLVMSPIRVLib.h
${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVLib/LLVMSPIRVOpts.h
${LLVM_SPIRV_INCLUDE_DIRS}/LLVMSPIRVLib/LLVMSPIRVExtensions.inc
DESTINATION
${CMAKE_INSTALL_PREFIX}/include/LLVMSPIRVLib
)
Expand Down
0 include/LLVMSPIRVExtensions.inc → include/LLVMSPIRVLib/LLVMSPIRVExtensions.inc
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion include/LLVMSPIRVLib.h → include/LLVMSPIRVLib/LLVMSPIRVLib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#ifndef SPIRV_H
#define SPIRV_H

#include "LLVMSPIRVOpts.h"
#include "LLVMSPIRVLib/LLVMSPIRVOpts.h"

#include <cstdint>
#include <iostream>
Expand Down
0 include/LLVMSPIRVOpts.h → include/LLVMSPIRVLib/LLVMSPIRVOpts.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions lib/SPIRV/LLVMSPIRVOpts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
///
//===----------------------------------------------------------------------===//

#include "LLVMSPIRVOpts.h"
#include "LLVMSPIRVLib/LLVMSPIRVOpts.h"

#include "SPIRVEnum.h"
#include <llvm/ADT/SmallVector.h>
Expand All @@ -51,7 +51,7 @@ using namespace SPIRV;

void TranslatorOpts::enableAllExtensions() {
#define EXT(X) ExtStatusMap[ExtensionID::X] = true;
#include "LLVMSPIRVExtensions.inc"
#include "LLVMSPIRVLib/LLVMSPIRVExtensions.inc"
#undef EXT
}

Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/OCLTypeToSPIRV.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#ifndef SPIRV_OCLTYPETOSPIRV_H
#define SPIRV_OCLTYPETOSPIRV_H

#include "LLVMSPIRVLib.h"
#include "LLVMSPIRVLib/LLVMSPIRVLib.h"
#include "SPIRVBuiltinHelper.h"
#include "llvm/IR/Function.h"
#include "llvm/IR/LLVMContext.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/SPIRVBuiltinHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#ifndef SPIRVBUILTINHELPER_H
#define SPIRVBUILTINHELPER_H

#include "LLVMSPIRVLib.h"
#include "LLVMSPIRVLib/LLVMSPIRVLib.h"
#include "libSPIRV/SPIRVOpCode.h"
#include "libSPIRV/SPIRVType.h"
#include "llvm/ADT/SmallVector.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/SPIRVInternal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#include "libSPIRV/SPIRVType.h"
#include "libSPIRV/SPIRVUtil.h"

#include "LLVMSPIRVLib.h"
#include "LLVMSPIRVLib/LLVMSPIRVLib.h"
#include "llvm/IR/Attributes.h"
#include "llvm/IR/Constants.h"
#include "llvm/IR/Instructions.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/SPIRVLowerBitCastToNonStandardType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#ifndef SPIRV_SPIRVLOWERBITCASTTONONSTANDARDTYPE_H
#define SPIRV_SPIRVLOWERBITCASTTONONSTANDARDTYPE_H

#include "LLVMSPIRVOpts.h"
#include "LLVMSPIRVLib/LLVMSPIRVOpts.h"

#include "llvm/IR/PassManager.h"
#include "llvm/Pass.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/SPIRVLowerLLVMIntrinsic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "LLVMBitreverse.h"
#include "LLVMSaddWithOverflow.h"

#include "LLVMSPIRVLib.h"
#include "LLVMSPIRVLib/LLVMSPIRVLib.h"
#include "SPIRVError.h"
#include "libSPIRV/SPIRVDebug.h"

Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/SPIRVLowerLLVMIntrinsic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#ifndef SPIRV_SPIRVLOWERLLVMINTRINSIC_H
#define SPIRV_SPIRVLOWERLLVMINTRINSIC_H

#include "LLVMSPIRVOpts.h"
#include "LLVMSPIRVLib/LLVMSPIRVOpts.h"

#include "llvm/IR/InstVisitor.h"
#include "llvm/IR/PassManager.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/SPIRVWriterPass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//

#include "SPIRVWriterPass.h"
#include "LLVMSPIRVLib.h"
#include "LLVMSPIRVLib/LLVMSPIRVLib.h"
#include "llvm/IR/Module.h"
#include "llvm/IR/PassManager.h"
#include "llvm/Pass.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/SPIRVWriterPass.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#ifndef SPIRV_SPIRVWRITERPASS_H
#define SPIRV_SPIRVWRITERPASS_H

#include "LLVMSPIRVOpts.h"
#include "LLVMSPIRVLib/LLVMSPIRVOpts.h"
#include "llvm/ADT/StringRef.h"

namespace llvm {
Expand Down
4 changes: 2 additions & 2 deletions lib/SPIRV/libSPIRV/SPIRVEnum.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#ifndef SPIRV_LIBSPIRV_SPIRVENUM_H
#define SPIRV_LIBSPIRV_SPIRVENUM_H

#include "LLVMSPIRVOpts.h"
#include "LLVMSPIRVLib/LLVMSPIRVOpts.h"
#include "SPIRVOpCode.h"
#include "spirv/unified1/spirv.hpp"
#include "spirv_internal.hpp"
Expand Down Expand Up @@ -122,7 +122,7 @@ template <> inline void SPIRVMap<ExtensionID, std::string>::init() {
#define _STRINGIFY(X) #X
#define STRINGIFY(X) _STRINGIFY(X)
#define EXT(X) add(ExtensionID::X, STRINGIFY(X));
#include "LLVMSPIRVExtensions.inc"
#include "LLVMSPIRVLib/LLVMSPIRVExtensions.inc"
#undef EXT
#undef STRINGIFY
#undef _STRINGIFY
Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/libSPIRV/SPIRVError.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
//
//===----------------------------------------------------------------------===//

#include "LLVMSPIRVLib.h"
#include "LLVMSPIRVLib/LLVMSPIRVLib.h"

#include "SPIRVError.h"
#include <string>
Expand Down
2 changes: 1 addition & 1 deletion lib/SPIRV/libSPIRV/SPIRVModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#ifndef SPIRV_LIBSPIRV_SPIRVMODULE_H
#define SPIRV_LIBSPIRV_SPIRVMODULE_H

#include "LLVMSPIRVOpts.h"
#include "LLVMSPIRVLib/LLVMSPIRVOpts.h"
#include "SPIRVEntry.h"

#include "llvm/IR/Metadata.h"
Expand Down
4 changes: 2 additions & 2 deletions tools/llvm-spirv/llvm-spirv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
#define _SPIRV_SUPPORT_TEXT_FMT
#endif

#include "LLVMSPIRVLib.h"
#include "LLVMSPIRVLib/LLVMSPIRVLib.h"

#include <fstream>
#include <iostream>
Expand Down Expand Up @@ -582,7 +582,7 @@ static int parseSPVExtOption(
#define _STRINGIFY(X) #X
#define STRINGIFY(X) _STRINGIFY(X)
#define EXT(X) ExtensionNamesMap[STRINGIFY(X)] = ExtensionID::X;
#include "LLVMSPIRVExtensions.inc"
#include "LLVMSPIRVLib/LLVMSPIRVExtensions.inc"
#undef EXT
#undef STRINGIFY
#undef _STRINGIFY
Expand Down