Few build fixes

* Keep global CMAKE_INCLUDE_CURRENT_DIR=ON like llvm sets it. Instead
turning it OFF for level_zero build
* adding ze_loader to unified runtime deps

Author: Pavel V Chupin

sycl/CMakeLists.txt

@@ -5,7 +5,6 @@ project(sycl-solution)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_INCLUDE_CURRENT_DIR OFF)
 option(SYCL_ENABLE_WERROR "Treat all warnings as errors in SYCL project" OFF)
 option(SYCL_DISABLE_STL_ASSERTIONS "Disable assertions in STL containers" OFF)
 option(SYCL_ADD_DEV_VERSION_POSTFIX "Adds -V postfix to version string" ON)

sycl/plugins/level_zero/CMakeLists.txt

@@ -15,6 +15,8 @@ else()
   set(LEVEL_ZERO_LOADER_TAG v1.8.8)
 endif()
 
+set(CMAKE_INCLUDE_CURRENT_DIR OFF)
+
 message(STATUS "Will fetch Level Zero Loader from ${LEVEL_ZERO_LOADER_REPO}")
 include(FetchContent)
 FetchContent_Declare(level-zero-loader

sycl/plugins/opencl/CMakeLists.txt

@@ -14,8 +14,6 @@ add_sycl_plugin(opencl
   SOURCES
     "${sycl_inc_dir}/sycl/detail/pi.h"
     "pi_opencl.cpp"
-  INCLUDE_DIRS
-    "."
   LIBRARIES
     OpenCL-ICD
 )

sycl/plugins/unified_runtime/CMakeLists.txt

@@ -45,11 +45,10 @@ add_sycl_plugin(unified_runtime
     "adapters/level_zero/ur_level_zero.hpp"
     "adapters/level_zero/ur_level_zero.cpp"
   INCLUDE_DIRS
-    "."
     "${UNIFIED_RUNTIME_INCLUDE_DIR}"
   LIBRARIES
     Threads::Threads
     UnifiedRuntime-Headers
     LevelZeroLoader-Headers
-#    ze_loader
+    ze_loader
 )