[Bf-blender-cvs] [f9d72db82db] cycles_oneapi: Merge branch 'master' into cycles_oneapi

[Werner, Stefan]

Commit: f9d72db82dbc73fe083998bfbf13e3b5069b07d1
Author: Werner, Stefan
Date:   Fri Apr 8 21:03:03 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rBf9d72db82dbc73fe083998bfbf13e3b5069b07d1

Merge branch 'master' into cycles_oneapi

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



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

diff --cc intern/cycles/CMakeLists.txt
index 044f86ffdfd,911e1cf214c..8b229fac641
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@@ -257,13 -262,8 +262,12 @@@ if(WITH_CYCLES_DEVICE_OPTIX
    endif()
  endif()
  
 +if (WITH_CYCLES_DEVICE_ONEAPI)
 +  add_definitions(-DWITH_ONEAPI)
 +endif()
 +
  if(WITH_CYCLES_EMBREE)
    add_definitions(-DWITH_EMBREE)
-   add_definitions(-DEMBREE_STATIC_LIB)
    include_directories(
      SYSTEM
      ${EMBREE_INCLUDE_DIRS}
diff --cc intern/cycles/cmake/external_libs.cmake
index 5d507c1599a,05c0980bdfb..0c0bdd220d1
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@@ -555,20 -675,15 +676,33 @@@ if(WITH_CYCLES_DEVICE_METAL
    endif()
  endif()
  
 +###########################################################################
 +# oneAPI
 +###########################################################################
 +if (WITH_CYCLES_DEVICE_ONEAPI)
 +  find_package(SYCL)
 +  find_package(LevelZero)
 +
 +  if (SYCL_FOUND AND LEVEL_ZERO_FOUND)
 +    message(STATUS "Found oneAPI: ${SYCL_LIBRARY}")
 +    message(STATUS "Found Level Zero: ${LEVEL_ZERO_LIBRARY}")
 +  else()
 +    message(STATUS "oneAPI or Level Zero not found, disabling oneAPI device from Cycles")
 +    set(WITH_CYCLES_DEVICE_ONEAPI OFF)
 +  endif()
 +endif()
 +
 +unset(_cycles_lib_dir)
++
+ ###########################################################################
+ # macOS
+ ###########################################################################
+ 
+ if(CYCLES_STANDALONE_REPOSITORY)
+   # On macOS, always use zlib from system.
+   if(APPLE)
+     set(ZLIB_ROOT /usr)
+     find_package(ZLIB REQUIRED)
+     find_package(PNG REQUIRED)
+   endif()
+ endif()