[Bf-blender-cvs] [c3052f9126f] blender2.8: Fix merge error, this should have been included from master.
Brecht Van Lommel
noreply at git.blender.org
Fri Sep 28 10:47:37 CEST 2018
Commit: c3052f9126f4b8f694a5c11da713a2362661277b
Author: Brecht Van Lommel
Date: Fri Sep 28 10:47:11 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc3052f9126f4b8f694a5c11da713a2362661277b
Fix merge error, this should have been included from master.
===================================================================
M intern/cycles/CMakeLists.txt
===================================================================
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()
More information about the Bf-blender-cvs
mailing list