forked from bartvdbraak/blender
Fix build with old CMake versions.
This commit is contained in:
parent
45c11c1a1b
commit
f5b46daf52
@ -308,7 +308,7 @@ if(WITH_CYCLES_CUDA_BINARIES AND (NOT WITH_CYCLES_CUBIN_COMPILER))
|
||||
endif()
|
||||
unset(MAX_MSVC)
|
||||
elseif(APPLE)
|
||||
if(${XCODE_VERSION} VERSION_GREATER_EQUAL 10.0)
|
||||
if(NOT (${XCODE_VERSION} VERSION_LESS 10.0))
|
||||
message(STATUS "nvcc not supported for this compiler version, using cycles_cubin_cc instead.")
|
||||
set(WITH_CYCLES_CUBIN_COMPILER ON)
|
||||
endif()
|
||||
@ -317,7 +317,7 @@ endif()
|
||||
|
||||
# NVRTC gives wrong rendering result in CUDA 10.0, so we must use NVCC.
|
||||
if(WITH_CYCLES_CUDA_BINARIES AND WITH_CYCLES_CUBIN_COMPILER)
|
||||
if(${CUDA_VERSION} VERSION_GREATER_EQUAL 10.0)
|
||||
if(NOT (${CUDA_VERSION} VERSION_LESS 10.0))
|
||||
message(STATUS "cycles_cubin_cc not supported for CUDA 10.0+, using nvcc instead.")
|
||||
set(WITH_CYCLES_CUBIN_COMPILER OFF)
|
||||
endif()
|
||||
|
@ -454,7 +454,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
|
||||
foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
|
||||
if(${arch} MATCHES "sm_2.")
|
||||
message(STATUS "CUDA binaries for ${arch} are no longer supported, skipped.")
|
||||
elseif(${arch} MATCHES "sm_7." AND NOT (${CUDA_VERSION} VERSION_GREATER_EQUAL 10.0))
|
||||
elseif(${arch} MATCHES "sm_7." AND (${CUDA_VERSION} VERSION_LESS 10.0))
|
||||
message(STATUS "CUDA binaries for ${arch} require CUDA 10.0+, skipped.")
|
||||
else()
|
||||
# Compile regular kernel
|
||||
|
Loading…
Reference in New Issue
Block a user