[Bf-blender-cvs] [e0ae2d042dd] cycles_oneapi: Cycles oneAPI: Fixed build with oneAPI distribution compiler

[Werner, Stefan]

Commit: e0ae2d042dd659f5651e0dc528581fb9b872656d
Author: Werner, Stefan
Date:   Wed Jun 8 12:27:55 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rBe0ae2d042dd659f5651e0dc528581fb9b872656d

Cycles oneAPI: Fixed build with oneAPI distribution compiler

That part of the CMake script  was still using new CMake methods,
it now matches the script for the OSS SYCL compiler.

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

M	intern/cycles/kernel/CMakeLists.txt

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

diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index b7652d3a0a5..14134ae87ac 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -818,7 +818,7 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
       add_custom_command(
         OUTPUT ${cycles_kernel_oneapi_lib}
         COMMAND "${sycl_compiler_root}/../../env/vars.bat"
-        COMMAND ${SYCL_COMPILER} $<$<CONFIG:Debug,RelWithDebInfo>:-g> ${sycl_compiler_flags}
+        COMMAND ${SYCL_COMPILER} $<$<CONFIG:Debug>:-g>$<$<CONFIG:RelWithDebInfo>:-g> ${sycl_compiler_flags}
         DEPENDS ${cycles_oneapi_kernel_sources})
     else()
       # The open source SYCL compiler just goes by clang++ and does not have such a script.
@@ -859,7 +859,7 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
     if(sycl_compiler_compiler_name MATCHES "dpcpp")
       add_custom_command(
         OUTPUT ${cycles_kernel_oneapi_lib}
-        COMMAND bash -c \"source ${sycl_compiler_root}/../../env/vars.sh&&${SYCL_COMPILER} $<$<CONFIG:Debug,RelWithDebInfo>:-g> ${sycl_compiler_flags}\"
+        COMMAND bash -c \"source ${sycl_compiler_root}/../../env/vars.sh&&${SYCL_COMPILER} $<$<CONFIG:Debug>:-g>$<$<CONFIG:RelWithDebInfo>:-g> ${sycl_compiler_flags}\"
         DEPENDS ${cycles_oneapi_kernel_sources})
     else()
       # The open source SYCL compiler just goes by clang++ and does not have such a script.