diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-03-26 20:41:44 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-03-26 20:41:44 +0300 |
| commit | 86c61ce64f6e8c921d8770fcd42ed2c21d01ca3a (patch) | |
| tree | e13f1941567bffbc159063a6891431ee9b158bac /intern/cycles/CMakeLists.txt | |
| parent | 58ea0d93f193adf84162d736c3c69500584e1aef (diff) | |
Cycles: Restore cycles_cubin_cc to working order
Reviewed by: brecht pmoursnv
Differential Revision: https://developer.blender.org/D7136
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 024a94ea437..121c8bdad6e 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -313,9 +313,7 @@ if(WITH_CYCLES_CUDA_BINARIES AND (NOT WITH_CYCLES_CUBIN_COMPILER)) set(MAX_MSVC 1910) elseif(${CUDA_VERSION} EQUAL "9.1") set(MAX_MSVC 1911) - elseif(${CUDA_VERSION} EQUAL "10.0") - set(MAX_MSVC 1999) - elseif(${CUDA_VERSION} EQUAL "10.1") + elseif(${CUDA_VERSION} LESS "11.0") set(MAX_MSVC 1999) endif() if(NOT MSVC_VERSION LESS ${MAX_MSVC} OR CMAKE_C_COMPILER_ID MATCHES "Clang") @@ -332,7 +330,7 @@ if(WITH_CYCLES_CUDA_BINARIES AND (NOT WITH_CYCLES_CUBIN_COMPILER)) 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(WITH_CYCLES_CUDA_BINARIES AND WITH_CYCLES_CUBIN_COMPILER AND NOT WITH_CYCLES_CUBIN_COMPILER_OVERRRIDE) 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) |