kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix merge error, this should have been included from master.

Browse Source
This commit is contained in:
Brecht Van Lommel 2018-09-28 10:47:11 +02:00
parent 29c8c6cf4f
commit c3052f9126
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/CMakeLists.txt
View File

@ -289,6 +289,11 @@ if(WITH_CYCLES_CUDA_BINARIES AND (NOT WITH_CYCLES_CUBIN_COMPILER))
set(WITH_CYCLES_CUBIN_COMPILER ON)
endif()
unset(MAX_MSVC)
elseif(APPLE)
if(${XCODE_VERSION} VERSION_GREATER_EQUAL 10.0)
message(STATUS "nvcc not supported for this compiler version, using cycles_cubin_cc instead.")
set(WITH_CYCLES_CUBIN_COMPILER ON)
endif()
endif()
endif()