diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-11 17:18:43 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-11 17:18:43 +0300 |
| commit | f60018e425ac5c488789ee15055f89f39e5cbb05 (patch) | |
| tree | e458a65f969fc161c39b829dac7f45c7a660209e /intern/cycles/kernel | |
| parent | d415b5c7b85b07ce4e30e4dbe33491df23202cdc (diff) | |
| parent | 84b02dc54a8c06e963a263e7232e41a993ab21c8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/kernel')
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 78e03a7f066..163aacf19f9 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -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 (${CUDA_VERSION} VERSION_LESS 10.0)) + elseif(${arch} MATCHES "sm_7." AND (${CUDA_VERSION} LESS 100) AND (NOT DEFINED CUDA10_NVCC_EXECUTABLE)) message(STATUS "CUDA binaries for ${arch} require CUDA 10.0+, skipped.") else() # Compile regular kernel |