Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey@blender.org>2022-06-17 18:20:47 +0300
committerSergey Sharybin <sergey@blender.org>2022-06-17 18:20:47 +0300
commitafaa38628ecc9d67eb45c6067167ea66ed5ee550 (patch)
tree07e03d991d4bd6b7350c9910e755ce634e3f39f0 /build_files
parentafd29854d3044e1aabe557a32ac4b8408e235217 (diff)
Cycles oneAPI: Fix detection of pre-compiled DPC++ on Windows
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/Modules/FindSYCL.cmake1
-rw-r--r--build_files/cmake/platform/platform_win32.cmake1
2 files changed, 2 insertions, 0 deletions
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)