Replace OPENCL_ICD_LOADER_HEADERS_DIR with OpenCL_INCLUDE_DIR

Also cleanup in a few places where it's not used

Author: Pavel V Chupin

opencl/CMakeLists.txt

@@ -12,7 +12,8 @@ FetchContent_Declare(ocl-headers
 
 FetchContent_MakeAvailable(ocl-headers)
 FetchContent_GetProperties(ocl-headers)
-set(OpenCL_INCLUDE_DIRS ${ocl-headers_SOURCE_DIR})
+set(OpenCL_INCLUDE_DIR
+  ${ocl-headers_SOURCE_DIR} CACHE PATH "Path to OpenCL Headers")
 
 target_compile_definitions(Headers INTERFACE -DCL_TARGET_OPENCL_VERSION=220)
 add_library(OpenCL-Headers ALIAS Headers)
@@ -21,7 +22,7 @@ add_library(OpenCL-Headers ALIAS Headers)
 
 # Set OPENCL_ICD_LOADER_HEADERS_DIR, as prerequisite for ICD build
 set(OPENCL_ICD_LOADER_HEADERS_DIR
-  ${OpenCL_INCLUDE_DIRS} PATH "Path to OpenCL Headers")
+  ${OpenCL_INCLUDE_DIR} CACHE PATH "Path to OpenCL Headers")
 
 # LLVM build sets this OFF by default, but we need OpenCL to be built as shared
 # library.

sycl/CMakeLists.txt

@@ -80,11 +80,11 @@ endif()
 # Copy OpenCL Headers into sycl headers build directory
 # Compiler does automatic lookup bin/../include based on clang binary location,
 # e.g. when run LIT tests
-file(COPY ${OPENCL_ICD_LOADER_HEADERS_DIR}/CL
+file(COPY ${OpenCL_INCLUDE_DIR}/CL
      DESTINATION ${SYCL_INCLUDE_BUILD_DIR}/sycl)
 
 # Include OpenCL Headers into final bundle.
-install(DIRECTORY ${OPENCL_ICD_LOADER_HEADERS_DIR}/CL
+install(DIRECTORY ${OpenCL_INCLUDE_DIR}/CL
         DESTINATION ${SYCL_INCLUDE_DEPLOY_DIR}/sycl
         COMPONENT OpenCL-Headers)
 

sycl/plugins/level_zero/CMakeLists.txt

@@ -39,7 +39,6 @@ if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
     INSTALL_DIR       "${CMAKE_CURRENT_BINARY_DIR}/level_zero_loader_install"
     CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
-               -DOpenCL_INCLUDE_DIR=${OpenCL_INCLUDE_DIRS}
                -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
                -DCMAKE_INSTALL_LIBDIR:PATH=lib${LLVM_LIBDIR_SUFFIX}
                ${AUX_CMAKE_FLAGS}

sycl/tools/sycl-ls/CMakeLists.txt

@@ -1,12 +1,6 @@
 add_executable(sycl-ls sycl-ls.cpp)
 add_dependencies(sycl-ls sycl)
-target_include_directories(sycl-ls PRIVATE "${sycl_inc_dir}"
-#FIXME: OpenCL headers has to be added explicitly here for CUDA target build,
-#       to overrule OpenCL headers included in CUDA which are implicitly present
-#       as sycl target interface (for CUDA build)
-#       This shouldn't be required if sycl-ls app would depend solely on SYCL
-#       headers, but currently it requires OpenCL headers
-      "${OPENCL_ICD_LOADER_HEADERS_DIR}")
+target_include_directories(sycl-ls PRIVATE "${sycl_inc_dir}")
 target_link_libraries(sycl-ls
   PRIVATE
     sycl