[Bf-blender-cvs] [e3c79bdfd5d] cycles_oneapi: Build: fix cmake 3.10 compatibility for oneAPI/Windows

Xavier Hallade noreply at git.blender.org
Thu May 26 09:17:31 CEST 2022


Commit: e3c79bdfd5dcebdca833047e78a4b13082ae7e7b
Author: Xavier Hallade
Date:   Thu May 26 09:17:23 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rBe3c79bdfd5dcebdca833047e78a4b13082ae7e7b

Build: fix cmake 3.10 compatibility for oneAPI/Windows

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

M	intern/cycles/kernel/CMakeLists.txt

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

diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index ed73289ae15..3df2574f1eb 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -835,7 +835,7 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
         COMMAND ${CMAKE_COMMAND} -E env
                 "LIB=${sycl_compiler_root}/../lib" # for compiler to find sycl.lib
                 "PATH=${OCLOC_INSTALL_DIR};${sycl_compiler_root}"
-                ${SYCL_COMPILER} $<$<CONFIG:Debug,RelWithDebInfo>:-g> ${sycl_compiler_flags}
+                ${SYCL_COMPILER} $<$<CONFIG:Debug>:-g>$<$<CONFIG:RelWithDebInfo>:-g> ${sycl_compiler_flags}
         DEPENDS ${cycles_oneapi_kernel_sources})
     endif()
   else()



More information about the Bf-blender-cvs mailing list