From 484714992c879400fbef380dfe77de6b1c875e03 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 7 Dec 2021 18:27:51 +0100 Subject: Build: remove Cycles CUDA/HIP/OPTIX build options on macOS So those device types are not listed in the preferences. Metal will be added instead as the only option. --- CMakeLists.txt | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index d0bed1362d0..3eacc0d76e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -433,30 +433,35 @@ mark_as_advanced(WITH_CYCLES_DEBUG_NAN) mark_as_advanced(WITH_CYCLES_NATIVE_ONLY) # NVIDIA CUDA & OptiX -option(WITH_CYCLES_DEVICE_CUDA "Enable Cycles NVIDIA CUDA compute support" ON) -option(WITH_CYCLES_DEVICE_OPTIX "Enable Cycles NVIDIA OptiX support" ON) -mark_as_advanced(WITH_CYCLES_DEVICE_CUDA) - -option(WITH_CYCLES_CUDA_BINARIES "Build Cycles NVIDIA CUDA binaries" OFF) -set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 sm_86 compute_75 CACHE STRING "CUDA architectures to build binaries for") -option(WITH_CYCLES_CUBIN_COMPILER "Build cubins with nvrtc based compiler instead of nvcc" OFF) -option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF) -option(WITH_CUDA_DYNLOAD "Dynamically load CUDA libraries at runtime (for developers, makes cuda-gdb work)" ON) -mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) -mark_as_advanced(WITH_CYCLES_CUBIN_COMPILER) -mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL) -mark_as_advanced(WITH_CUDA_DYNLOAD) +if(NOT APPLE) + option(WITH_CYCLES_DEVICE_CUDA "Enable Cycles NVIDIA CUDA compute support" ON) + option(WITH_CYCLES_DEVICE_OPTIX "Enable Cycles NVIDIA OptiX support" ON) + mark_as_advanced(WITH_CYCLES_DEVICE_CUDA) + + option(WITH_CYCLES_CUDA_BINARIES "Build Cycles NVIDIA CUDA binaries" OFF) + set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 sm_86 compute_75 CACHE STRING "CUDA architectures to build binaries for") + option(WITH_CYCLES_CUBIN_COMPILER "Build cubins with nvrtc based compiler instead of nvcc" OFF) + option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF) + option(WITH_CUDA_DYNLOAD "Dynamically load CUDA libraries at runtime (for developers, makes cuda-gdb work)" ON) + mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) + mark_as_advanced(WITH_CYCLES_CUBIN_COMPILER) + mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL) + mark_as_advanced(WITH_CUDA_DYNLOAD) +endif() # AMD HIP -if(WIN32) - option(WITH_CYCLES_DEVICE_HIP "Enable Cycles AMD HIP support" ON) -else() - option(WITH_CYCLES_DEVICE_HIP "Enable Cycles AMD HIP support" OFF) +if(NOT APPLE) + if(WIN32) + option(WITH_CYCLES_DEVICE_HIP "Enable Cycles AMD HIP support" ON) + else() + option(WITH_CYCLES_DEVICE_HIP "Enable Cycles AMD HIP support" OFF) + endif() + + option(WITH_CYCLES_HIP_BINARIES "Build Cycles AMD HIP binaries" OFF) + set(CYCLES_HIP_BINARIES_ARCH gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 CACHE STRING "AMD HIP architectures to build binaries for") + mark_as_advanced(WITH_CYCLES_DEVICE_HIP) + mark_as_advanced(CYCLES_HIP_BINARIES_ARCH) endif() -option(WITH_CYCLES_HIP_BINARIES "Build Cycles AMD HIP binaries" OFF) -set(CYCLES_HIP_BINARIES_ARCH gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 CACHE STRING "AMD HIP architectures to build binaries for") -mark_as_advanced(WITH_CYCLES_DEVICE_HIP) -mark_as_advanced(CYCLES_HIP_BINARIES_ARCH) # Draw Manager option(WITH_DRAW_DEBUG "Add extra debug capabilities to Draw Manager" OFF) -- cgit v1.2.3