[Bf-blender-cvs] [57f74289dfa] cycles_oneapi: Cycles: Tweak SYCL dependencies install folders

[Sergey Sharybin]

Commit: 57f74289dfa2e258893e82fb8f75bfc5157f3d9c
Author: Sergey Sharybin
Date:   Mon Jun 27 10:50:48 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rB57f74289dfa2e258893e82fb8f75bfc5157f3d9c

Cycles: Tweak SYCL dependencies install folders

Mainly avoid relative path for the Cycles standalone.
This still needs to be looked into a bit closer, but it does seem safer
to use same path as for the Cycles application.

Also clarify why a level up path is used for Blender.

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

M	intern/cycles/kernel/CMakeLists.txt

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

diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 1453f1e47f1..ccd694dfdfd 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -884,7 +884,16 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
         sycl.dll
         pi_level_zero.dll
     )
-    delayed_install("${sycl_compiler_root}" "${SYCL_RUNTIME_DEPENDENCIES}" "../")
+    if(NOT WITH_BLENDER)
+      # For the Cycles standalone put libraries next to the Cycles application.
+      delayed_install("${sycl_compiler_root}" "${SYCL_RUNTIME_DEPENDENCIES}" ${CYCLES_INSTALL_PATH})
+    else()
+      # For Blender put the libraries next to the Blender executable.
+      #
+      # Note that the installation path in the delayed_install is relative to the versioned folder,
+      # which means we need to go one level up.
+      delayed_install("${sycl_compiler_root}" "${SYCL_RUNTIME_DEPENDENCIES}" "../")
+    endif()
   elseif(UNIX AND NOT APPLE)
     file(GLOB SYCL_RUNTIME_DEPENDENCIES
               ${sycl_compiler_root}/../lib/libsycl.so