more comments

Alexander Batashev · Alexander Batashev · commit 5178117779e0 · 2022-03-30T17:31:44.000+03:00
diff --git a/sycl/cmake/modules/AddSYCL.cmake b/sycl/cmake/modules/AddSYCL.cmake
@@ -33,19 +33,21 @@ endfunction()
 function(add_sycl_plugin PLUGIN_NAME)
   cmake_parse_arguments("ARG"
     ""
-    "LINKER_SCRIPT"
+    ""
     "SOURCES;INCLUDE_DIRS;LIBRARIES"
     ${ARGN}
   )
 
   add_sycl_library("pi_${PLUGIN_NAME}" SHARED
     TOOLCHAIN
-    LINKER_SCRIPT "${sycl_src_dir}/ld-version-script.txt"
+    LINKER_SCRIPT "${PROJECT_SOURCE_DIR}/source/ld-version-script.txt"
     SOURCES ${ARG_SOURCES}
     INCLUDE_DIRS
       ${ARG_INCLUDE_DIRS}
       ${sycl_inc_dir}
-    LIBRARIES ${ARG_LIBRARIES}
+    LIBRARIES
+      ${ARG_LIBRARIES}
+      OpenCL-Headers
   )
 
   install(TARGETS pi_${PLUGIN_NAME}
diff --git a/sycl/plugins/cuda/CMakeLists.txt b/sycl/plugins/cuda/CMakeLists.txt
@@ -30,7 +30,6 @@ add_sycl_plugin(cuda
     "pi_cuda.hpp"
     "pi_cuda.cpp"
   LIBRARIES
-    OpenCL-Headers
     cudadrv
 )
 
diff --git a/sycl/plugins/esimd_emulator/CMakeLists.txt b/sycl/plugins/esimd_emulator/CMakeLists.txt
@@ -109,7 +109,6 @@ add_sycl_plugin(esimd_emulator
     "pi_esimd_emulator.cpp"
   LIBRARIES
     "${LEVEL_ZERO_LOADER}"
-    OpenCL-Headers
     ${LIBCM}
     ${LIBIGFXCMRT_EMU}
     #TODO remove cyclic dependency
diff --git a/sycl/plugins/hip/CMakeLists.txt b/sycl/plugins/hip/CMakeLists.txt
@@ -18,8 +18,6 @@ add_sycl_plugin(hip
     "pi_hip.cpp"
   INCLUDE_DIRS
     ${sycl_plugin_dir}
-  LIBRARIES
-    OpenCL-Headers
 )
 set_target_properties(pi_hip PROPERTIES LINKER_LANGUAGE CXX)
 
diff --git a/sycl/plugins/level_zero/CMakeLists.txt b/sycl/plugins/level_zero/CMakeLists.txt
@@ -109,7 +109,6 @@ add_sycl_plugin(level_zero
     "${CMAKE_CURRENT_SOURCE_DIR}/usm_allocator.hpp"
   LIBRARIES
     "${LEVEL_ZERO_LOADER}"
-    OpenCL-Headers
     Threads::Threads
 )
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ add_sycl_plugin(cuda`
`30`	`30`	`"pi_cuda.hpp"`
`31`	`31`	`"pi_cuda.cpp"`
`32`	`32`	`LIBRARIES`
`33`		`- OpenCL-Headers`
`34`	`33`	`cudadrv`
`35`	`34`	`)`
`36`	`35`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@ add_sycl_plugin(hip`
`18`	`18`	`"pi_hip.cpp"`
`19`	`19`	`INCLUDE_DIRS`
`20`	`20`	`${sycl_plugin_dir}`
`21`		`- LIBRARIES`
`22`		`- OpenCL-Headers`
`23`	`21`	`)`
`24`	`22`	`set_target_properties(pi_hip PROPERTIES LINKER_LANGUAGE CXX)`
`25`	`23`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,6 @@ add_sycl_plugin(level_zero`
`109`	`109`	`"${CMAKE_CURRENT_SOURCE_DIR}/usm_allocator.hpp"`
`110`	`110`	`LIBRARIES`
`111`	`111`	`"${LEVEL_ZERO_LOADER}"`
`112`		`- OpenCL-Headers`
`113`	`112`	`Threads::Threads`
`114`	`113`	`)`
`115`	`114`