Commit: 151b653bd5f3460363663a65eb389025e7f9c38a
Author: Xavier Hallade
Date: Wed Oct 19 12:51:16 2022 +0200
Branches: master
https://developer.blender.org/rB151b653bd5f3460363663a65eb389025e7f9c38a
Cycles: oneAPI: fix clean Windows ninja builds
Previously, a first build using ninja would throw "ninja: error:
'intern/cycles/kernel/cycles_kernel_oneapi.lib', needed by
'bin/blender.exe', missing and no known rule to make it".
===================================================================
M intern/cycles/kernel/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/kernel/CMakeLists.txt
b/intern/cycles/kernel/CMakeLists.txt
index e5d1c3d6563..6140e90042b 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -715,6 +715,7 @@ endif()
if(WITH_CYCLES_DEVICE_ONEAPI)
if(WIN32)
set(cycles_kernel_oneapi_lib
${CMAKE_CURRENT_BINARY_DIR}/cycles_kernel_oneapi.dll)
+ set(cycles_kernel_oneapi_linker_lib
${CMAKE_CURRENT_BINARY_DIR}/cycles_kernel_oneapi.lib)
else()
set(cycles_kernel_oneapi_lib
${CMAKE_CURRENT_BINARY_DIR}/libcycles_kernel_oneapi.so)
endif()
@@ -851,7 +852,7 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
-Xclang --dependent-lib=${sycl_library_debug_name})
add_custom_command(
- OUTPUT ${cycles_kernel_oneapi_lib}
+ OUTPUT ${cycles_kernel_oneapi_lib} ${cycles_kernel_oneapi_linker_lib}
COMMAND ${CMAKE_COMMAND} -E env
"LIB=${sycl_compiler_root}/../lib" # for compiler to find
sycl.lib
"PATH=${OCLOC_INSTALL_DIR}\;${sycl_compiler_root}"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
