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:
authorXavier Hallade <xavier.hallade@intel.com>2022-10-06 19:35:51 +0300
committerXavier Hallade <xavier.hallade@intel.com>2022-10-07 10:50:05 +0300
commit7eeeaec6da33971ab7805c9a4bfd5f4e186273d1 (patch)
treef3090686dab61d3a25d77fdbece49f1bc4c04ca4 /intern/cycles/device/CMakeLists.txt
parentfc0b1627ebb821b1897cbca7f6ba9be29e52359a (diff)
Cycles: use direct linking for oneAPI backend
This is a minimal set of changes, allowing a lot of cleanup that can happen afterward as it allows sycl method and objects to be used outside of kernel.cpp. Reviewed By: brecht, sergey Differential Revision: https://developer.blender.org/D15397
Diffstat (limited to 'intern/cycles/device/CMakeLists.txt')
-rw-r--r--intern/cycles/device/CMakeLists.txt16
1 files changed, 15 insertions, 1 deletions
diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt
index 24855d795d1..e5467121497 100644
--- a/intern/cycles/device/CMakeLists.txt
+++ b/intern/cycles/device/CMakeLists.txt
@@ -142,7 +142,6 @@ set(SRC
${SRC_DUMMY}
${SRC_MULTI}
${SRC_OPTIX}
- ${SRC_ONEAPI}
${SRC_HEADERS}
)
@@ -188,7 +187,22 @@ if(WITH_CYCLES_DEVICE_METAL)
)
endif()
if (WITH_CYCLES_DEVICE_ONEAPI)
+ if(WIN32)
+ set(cycles_kernel_oneapi_lib ${CMAKE_CURRENT_BINARY_DIR}/../kernel/cycles_kernel_oneapi.lib)
+ else()
+ set(cycles_kernel_oneapi_lib ${CMAKE_CURRENT_BINARY_DIR}/../kernel/libcycles_kernel_oneapi.so)
+ endif()
+ list(APPEND LIB
+ ${SYCL_LIBRARY}
+ ${cycles_kernel_oneapi_lib}
+ )
add_definitions(-DWITH_ONEAPI)
+ list(APPEND SRC
+ ${SRC_ONEAPI}
+ )
+ list(APPEND INC_SYS
+ ${SYCL_INCLUDE_DIR}
+ )
endif()
if(WITH_OPENIMAGEDENOISE)