address some comments

Author: Alexander Batashev

sycl/cmake/modules/AddSYCL.cmake

@@ -40,9 +40,11 @@ function(add_sycl_plugin PLUGIN_NAME)
 
   add_sycl_library("pi_${PLUGIN_NAME}" SHARED
     TOOLCHAIN
-    LINKER_SCRIPT ${ARG_LINKER_SCRIPT}
+    LINKER_SCRIPT "${sycl_src_dir}/ld-version-script.txt"
     SOURCES ${ARG_SOURCES}
-    INCLUDE_DIRS ${ARG_INCLUDE_DIRS}
+    INCLUDE_DIRS
+      ${ARG_INCLUDE_DIRS}
+      ${sycl_inc_dir}
     LIBRARIES ${ARG_LIBRARIES}
   )
 

sycl/plugins/cuda/CMakeLists.txt

@@ -29,12 +29,9 @@ add_sycl_plugin(cuda
     "${sycl_inc_dir}/CL/sycl/detail/pi.hpp"
     "pi_cuda.hpp"
     "pi_cuda.cpp"
-  INCLUDE_DIRS
-    "${sycl_inc_dir}"
   LIBRARIES
     OpenCL-Headers
     cudadrv
-  LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/../ld-version-script.txt"
 )
 
 set_target_properties(pi_cuda PROPERTIES LINKER_LANGUAGE CXX)

sycl/plugins/esimd_emulator/CMakeLists.txt

@@ -107,16 +107,13 @@ add_sycl_plugin(esimd_emulator
   SOURCES
     "${sycl_inc_dir}/CL/sycl/detail/pi.h"
     "pi_esimd_emulator.cpp"
-  INCLUDE_DIRS
-    ${sycl_inc_dir}
   LIBRARIES
     "${LEVEL_ZERO_LOADER}"
     OpenCL-Headers
     ${LIBCM}
     ${LIBIGFXCMRT_EMU}
     #TODO remove cyclic dependency
     sycl
-  LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/../ld-version-script.txt"
 )
 
 add_dependencies(pi_esimd_emulator cm-emu)

sycl/plugins/hip/CMakeLists.txt

@@ -17,11 +17,9 @@ add_sycl_plugin(hip
     "pi_hip.hpp"
     "pi_hip.cpp"
   INCLUDE_DIRS
-    ${sycl_inc_dir}
     ${sycl_plugin_dir}
   LIBRARIES
     OpenCL-Headers
-  LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/../ld-version-script.txt"
 )
 set_target_properties(pi_hip PROPERTIES LINKER_LANGUAGE CXX)
 

sycl/plugins/level_zero/CMakeLists.txt

@@ -107,13 +107,10 @@ add_sycl_plugin(level_zero
     "${CMAKE_CURRENT_SOURCE_DIR}/pi_level_zero.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/usm_allocator.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/usm_allocator.hpp"
-  INCLUDE_DIRS
-    ${sycl_inc_dir}
   LIBRARIES
     "${LEVEL_ZERO_LOADER}"
     OpenCL-Headers
     Threads::Threads
-  LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/../ld-version-script.txt"
 )
 
 if (TARGET level-zero-loader)

sycl/plugins/opencl/CMakeLists.txt

@@ -14,12 +14,9 @@ add_sycl_plugin(opencl
   SOURCES
     "${sycl_inc_dir}/CL/sycl/detail/pi.h"
     "pi_opencl.cpp"
-  INCLUDE_DIRS
-    "${sycl_inc_dir}"
   LIBRARIES
     OpenCL-Headers
     OpenCL-ICD
-  LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/../ld-version-script.txt"
 )
 
 set_target_properties(pi_opencl PROPERTIES LINKER_LANGUAGE CXX)