[SYCL] Fix post-commit build in tools (#5746)

Alexander Batashev · web-flow · commit d18e69cdb976 · 2022-03-10T13:09:42.000+03:00
diff --git a/sycl/tools/CMakeLists.txt b/sycl/tools/CMakeLists.txt
@@ -1,3 +1,10 @@
+function(link_llvm_libs target)
+  foreach(LIB ${ARGN})
+    target_include_directories(${target} SYSTEM PRIVATE ${LLVM_MAIN_INCLUDE_DIR})
+    target_link_libraries(${target} PRIVATE ${LIB})
+  endforeach()
+endfunction()
+
 add_subdirectory(sycl-ls)
 
 if (SYCL_ENABLE_XPTI_TRACING)
diff --git a/sycl/tools/sycl-prof/CMakeLists.txt b/sycl/tools/sycl-prof/CMakeLists.txt
@@ -6,7 +6,7 @@ target_include_directories(sycl-prof PRIVATE
   "${CMAKE_CURRENT_SOURCE_DIR}/../xpti_helpers/"
 )
 
-target_link_libraries(sycl-prof PRIVATE
+link_llvm_libs(sycl-prof
   LLVMSupport
 )
 
diff --git a/sycl/tools/sycl-sanitize/CMakeLists.txt b/sycl/tools/sycl-sanitize/CMakeLists.txt
@@ -4,7 +4,7 @@ target_include_directories(sycl-sanitize PRIVATE
   "${CMAKE_CURRENT_SOURCE_DIR}/../xpti_helpers/"
 )
 
-target_link_libraries(sycl-sanitize PRIVATE
+link_llvm_libs(sycl-sanitize
   LLVMSupport
 )
 
diff --git a/sycl/tools/sycl-trace/CMakeLists.txt b/sycl/tools/sycl-trace/CMakeLists.txt
@@ -6,7 +6,7 @@ target_include_directories(sycl-trace PRIVATE
 
 target_compile_options(sycl-trace PRIVATE -fno-exceptions -fno-rtti)
 
-target_link_libraries(sycl-trace PRIVATE
+link_llvm_libs(sycl-trace
   LLVMSupport
 )
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ target_include_directories(sycl-prof PRIVATE`
`6`	`6`	`"${CMAKE_CURRENT_SOURCE_DIR}/../xpti_helpers/"`
`7`	`7`	`)`
`8`	`8`
`9`		`-target_link_libraries(sycl-prof PRIVATE`
	`9`	`+link_llvm_libs(sycl-prof`
`10`	`10`	`LLVMSupport`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ target_include_directories(sycl-sanitize PRIVATE`
`4`	`4`	`"${CMAKE_CURRENT_SOURCE_DIR}/../xpti_helpers/"`
`5`	`5`	`)`
`6`	`6`
`7`		`-target_link_libraries(sycl-sanitize PRIVATE`
	`7`	`+link_llvm_libs(sycl-sanitize`
`8`	`8`	`LLVMSupport`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ target_include_directories(sycl-trace PRIVATE`
`6`	`6`
`7`	`7`	`target_compile_options(sycl-trace PRIVATE -fno-exceptions -fno-rtti)`
`8`	`8`
`9`		`-target_link_libraries(sycl-trace PRIVATE`
	`9`	`+link_llvm_libs(sycl-trace`
`10`	`10`	`LLVMSupport`
`11`	`11`	`)`
`12`	`12`