[Bf-blender-cvs] [1336e97] master: Cycles: Use CUDA_64_BIT_DEVICE_CODE to detect which CUDA architecture to use

Sergey Sharybin noreply at git.blender.org
Mon Feb 15 19:15:53 CET 2016


Commit: 1336e97b1242bc99b91cb74b3a810724b544c596
Author: Sergey Sharybin
Date:   Mon Feb 15 19:08:36 2016 +0100
Branches: master
https://developer.blender.org/rB1336e97b1242bc99b91cb74b3a810724b544c596

Cycles: Use CUDA_64_BIT_DEVICE_CODE to detect which CUDA architecture to use

It is initialized based on size of pointer, which matches our previous
behavior, but using it in Cycles side allows to cross-compile CUDA
binaries.

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

M	intern/cycles/kernel/CMakeLists.txt

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

diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index b5b0b1f..582db86 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -186,7 +186,7 @@ set(SRC_SPLIT_HEADERS
 
 if(WITH_CYCLES_CUDA_BINARIES)
 	# 32 bit or 64 bit
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	if(CUDA_64_BIT_DEVICE_CODE)
 		set(CUDA_BITS 64)
 	else()
 		set(CUDA_BITS 32)




More information about the Bf-blender-cvs mailing list