[Bf-blender-cvs] [afaa38628ec] cycles_oneapi: Cycles oneAPI: Fix detection of pre-compiled DPC++ on Windows

[Sergey Sharybin]

Commit: afaa38628ecc9d67eb45c6067167ea66ed5ee550
Author: Sergey Sharybin
Date:   Fri Jun 17 17:20:47 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rBafaa38628ecc9d67eb45c6067167ea66ed5ee550

Cycles oneAPI: Fix detection of pre-compiled DPC++ on Windows

===================================================================

M	build_files/cmake/Modules/FindSYCL.cmake
M	build_files/cmake/platform/platform_win32.cmake

===================================================================

diff --git a/build_files/cmake/Modules/FindSYCL.cmake b/build_files/cmake/Modules/FindSYCL.cmake
index 227858eefb1..ac90cbfbe43 100644
--- a/build_files/cmake/Modules/FindSYCL.cmake
+++ b/build_files/cmake/Modules/FindSYCL.cmake
@@ -37,6 +37,7 @@ FIND_PROGRAM(SYCL_COMPILER
   PATH_SUFFIXES
     bin
   NO_CMAKE_FIND_ROOT_PATH
+  NAMES_PER_DIR
 )
 
 # NOTE: No clang++ here so that we do not pick up a system-wide CLang
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index fbaf44b1f3f..7e272ea26b0 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -952,3 +952,4 @@ set(ZSTD_INCLUDE_DIRS ${LIBDIR}/zstd/include)
 set(ZSTD_LIBRARIES ${LIBDIR}/zstd/lib/zstd_static.lib)
 
 set(LEVEL_ZERO_ROOT_DIR ${LIBDIR}/level_zero)
+set(SYCL_ROOT_DIR ${LIBDIR}/dpcpp)