diff options
author | Sergey Sharybin <sergey@blender.org> | 2022-08-18 18:09:52 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey@blender.org> | 2022-08-18 18:09:52 +0300 |
commit | d8be33333f320ac8f21a3f67d361aee25fb78cd7 (patch) | |
tree | 9c820f5a6448a16511c469b3d8b32fa849848c65 /build_files | |
parent | 7d4aa0db9eaec526d33160db60884ab0043e16dd (diff) | |
parent | 96206aa98a98d7eaabbbdb77827aa53841aca1db (diff) |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/cmake/config/blender_release.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index 3661b1de805..a1b9f48db62 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -71,6 +71,8 @@ if(NOT WIN32) endif() if(WIN32) set(WITH_WASAPI ON CACHE BOOL "" FORCE) + # Disabled until the buildbot environment is configured. + set(WITH_CYCLES_ONEAPI_BINARIES OFF CACHE BOOL "" FORCE) endif() if(UNIX AND NOT APPLE) set(WITH_DOC_MANPAGE ON CACHE BOOL "" FORCE) @@ -78,6 +80,7 @@ if(UNIX AND NOT APPLE) set(WITH_PULSEAUDIO ON CACHE BOOL "" FORCE) set(WITH_X11_XINPUT ON CACHE BOOL "" FORCE) set(WITH_X11_XF86VMODE ON CACHE BOOL "" FORCE) + set(WITH_CYCLES_ONEAPI_BINARIES OM CACHE BOOL "" FORCE) endif() if(NOT APPLE) set(WITH_XR_OPENXR ON CACHE BOOL "" FORCE) @@ -87,7 +90,4 @@ if(NOT APPLE) set(WITH_CYCLES_CUBIN_COMPILER OFF CACHE BOOL "" FORCE) set(WITH_CYCLES_HIP_BINARIES ON CACHE BOOL "" FORCE) set(WITH_CYCLES_DEVICE_ONEAPI ON CACHE BOOL "" FORCE) - - # Disable AoT kernels compilations until buildbot can deliver them in a reasonable time. - set(WITH_CYCLES_ONEAPI_BINARIES OFF CACHE BOOL "" FORCE) endif() |