diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-10-05 06:56:20 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-10-05 06:56:20 +0300 |
| commit | ddfd6b518c15517f40053a7ade5ceb440de966f3 (patch) | |
| tree | 67bf08bb57578ad84942caf7a60fd193ac50c8ba /intern | |
| parent | 1b38effd5f270de0ef6b81fe78af4c63ed256e05 (diff) | |
| parent | 6e08b01bd9ab87f63d8176bf2ec0b4f073a92ee3 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 6d7c4be423a..9a09b1e6f1b 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -283,6 +283,8 @@ 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) endif() if(NOT MSVC_VERSION LESS ${MAX_MSVC} OR CMAKE_C_COMPILER_ID MATCHES "Clang") message(STATUS "nvcc not supported for this compiler version, using cycles_cubin_cc instead.") |