Skip to content

Commit 34c3982

Browse files
committed
Revert incorrect build failure fix
1 parent 1f27a02 commit 34c3982

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

llvm/lib/SYCLLowerIR/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,5 +115,9 @@ add_llvm_component_library(LLVMSYCLLowerIR
115115
)
116116

117117
target_include_directories(LLVMSYCLLowerIR
118-
PRIVATE ${LLVM_MAIN_SRC_DIR}/projects/vc-intrinsics/GenXIntrinsics/include
119-
PRIVATE ${LLVM_BINARY_DIR}/projects/vc-intrinsics/GenXIntrinsics/include)
118+
PUBLIC $<BUILD_INTERFACE:${LLVMGenXIntrinsics_SOURCE_DIR}/GenXIntrinsics/include/>
119+
PUBLIC $<BUILD_INTERFACE:${LLVMGenXIntrinsics_BINARY_DIR}>
120+
)
121+
target_link_libraries(LLVMSYCLLowerIR
122+
PUBLIC LLVMGenXIntrinsics
123+
)

llvm/tools/sycl-post-link/CMakeLists.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,12 @@ set(LLVM_LINK_COMPONENTS
1616
Analysis
1717
)
1818

19-
get_property(LLVMGenXIntrinsics_SOURCE_DIR GLOBAL PROPERTY LLVMGenXIntrinsics_SOURCE_PROP)
20-
get_property(LLVMGenXIntrinsics_BINARY_DIR GLOBAL PROPERTY LLVMGenXIntrinsics_BINARY_PROP)
21-
22-
include_directories(
23-
${LLVMGenXIntrinsics_SOURCE_DIR}/GenXIntrinsics/include
24-
${LLVMGenXIntrinsics_BINARY_DIR}/GenXIntrinsics/include)
25-
2619
add_llvm_tool(sycl-post-link
2720
sycl-post-link.cpp
28-
ADDITIONAL_HEADER_DIRS
29-
${LLVMGenXIntrinsics_SOURCE_DIR}/GenXIntrinsics/include
30-
${LLVMGenXIntrinsics_BINARY_DIR}/GenXIntrinsics/include
3121

3222
DEPENDS
3323
intrinsics_gen
34-
LLVMGenXIntrinsics
3524
)
3625

3726
setup_host_tool(sycl-post-link SYCL_POST_LINK
3827
sycl-post-link_exe sycl-post-link_target)
39-
40-
target_link_libraries(sycl-post-link PRIVATE LLVMGenXIntrinsics)

sycl-jit/jit-compiler/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ add_llvm_library(sycl-jit
3535
MC
3636
SYCLLowerIR
3737
SYCLPostLink
38-
GenXIntrinsics
3938
${LLVM_TARGETS_TO_BUILD}
4039

4140
LINK_LIBS

0 commit comments

Comments
 (0)