diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-28 11:47:11 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-28 11:47:11 +0300 |
commit | c3052f9126f4b8f694a5c11da713a2362661277b (patch) | |
tree | 66ed64beb96104e39a53b80be9a0a94cb2c1402f /intern | |
parent | 29c8c6cf4f8a6d1af19e9c14517928388ed4926a (diff) |
Fix merge error, this should have been included from master.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 0147a4306f4..6d7c4be423a 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -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() |