[Bf-blender-cvs] [fe3d875dabc] principled-v2: Disable HIP directly in CMake to prevent the buildbot command line from overriding it

[Lukas Stockner]

Commit: fe3d875dabcf6388316f68de16357b88e68ccf33
Author: Lukas Stockner
Date:   Tue Jul 5 22:14:02 2022 +0200
Branches: principled-v2
https://developer.blender.org/rBfe3d875dabcf6388316f68de16357b88e68ccf33

Disable HIP directly in CMake to prevent the buildbot command line from overriding it

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

M	build_files/cmake/config/blender_release.cmake
M	intern/cycles/kernel/CMakeLists.txt

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

diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
index 0b8ac269231..42759fec7cc 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -91,7 +91,7 @@ if(NOT APPLE)
   set(WITH_CYCLES_DEVICE_OPTIX    ON  CACHE BOOL "" FORCE)
   set(WITH_CYCLES_CUDA_BINARIES   ON  CACHE BOOL "" FORCE)
   set(WITH_CYCLES_CUBIN_COMPILER  OFF CACHE BOOL "" FORCE)
-  set(WITH_CYCLES_HIP_BINARIES    OFF CACHE BOOL "" FORCE)
+  set(WITH_CYCLES_HIP_BINARIES    ON  CACHE BOOL "" FORCE)
 
   # Disable AoT kernels compilations until buildbot can deliver them in a reasonabel time.
   set(WITH_CYCLES_ONEAPI_BINARIES OFF CACHE BOOL "" FORCE)
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 4eaae9fdb00..4c8e71e3ca7 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -540,7 +540,8 @@ endif()
 
 # HIP module
 
-if(WITH_CYCLES_HIP_BINARIES AND WITH_CYCLES_DEVICE_HIP)
+# TODO: Re-enable HIP and figure out compiler crash
+if(WITH_CYCLES_HIP_BINARIES AND WITH_CYCLES_DEVICE_HIP AND FALSE)
   # build for each arch
   set(hip_sources device/hip/kernel.cpp
     ${SRC_KERNEL_HEADERS}