[Bf-blender-cvs] [765795aed7b] master: Fix macOS buildbot build, wrong CUDA version check.

Brecht Van Lommel noreply at git.blender.org
Tue Dec 11 14:17:22 CET 2018


Commit: 765795aed7bfc738eb3c911ce5e5496fd0879a23
Author: Brecht Van Lommel
Date:   Tue Dec 11 14:14:52 2018 +0100
Branches: master
https://developer.blender.org/rB765795aed7bfc738eb3c911ce5e5496fd0879a23

Fix macOS buildbot build, wrong CUDA version check.

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

M	intern/cycles/kernel/CMakeLists.txt

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

diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 78e03a7f066..163aacf19f9 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -454,7 +454,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
 	foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
 		if(${arch} MATCHES "sm_2.")
 			message(STATUS "CUDA binaries for ${arch} are no longer supported, skipped.")
-		elseif(${arch} MATCHES "sm_7." AND (${CUDA_VERSION} VERSION_LESS 10.0))
+		elseif(${arch} MATCHES "sm_7." AND (${CUDA_VERSION} LESS 100) AND (NOT DEFINED CUDA10_NVCC_EXECUTABLE))
 			message(STATUS "CUDA binaries for ${arch} require CUDA 10.0+, skipped.")
 		else()
 			# Compile regular kernel



More information about the Bf-blender-cvs mailing list