[Bf-blender-cvs] [e8e2f510636] master: Fix CUDA build with Xcode 10.0, use nvrtc due to incompatible compilers.

Brecht Van Lommel noreply at git.blender.org
Thu Sep 27 15:21:34 CEST 2018


Commit: e8e2f510636f357864be20f2e0bd589d76753b29
Author: Brecht Van Lommel
Date:   Thu Sep 27 15:17:49 2018 +0200
Branches: master
https://developer.blender.org/rBe8e2f510636f357864be20f2e0bd589d76753b29

Fix CUDA build with Xcode 10.0, use nvrtc due to incompatible compilers.

===================================================================

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