[Bf-blender-cvs] [19c7e499e19] master: cycles: Fix x86 build error.

Ray Molenkamp noreply at git.blender.org
Wed Sep 5 00:58:50 CEST 2018


Commit: 19c7e499e19aadc7d6d7831bd6924de568cd957d
Author: Ray Molenkamp
Date:   Tue Sep 4 16:58:41 2018 -0600
Branches: master
https://developer.blender.org/rB19c7e499e19aadc7d6d7831bd6924de568cd957d

cycles: Fix x86 build error.

WITH_CYCLES_CUDA_BINARIES was set as a regular variable causing it to be overwritten by the release.cmake settings.

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

M	intern/cycles/app/CMakeLists.txt

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

diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index cfca45600a5..4fd551b33c2 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -131,7 +131,7 @@ if(WITH_CYCLES_CUBIN_COMPILER)
 	# to be build to compile the cubins.
 	if(MSVC AND NOT CMAKE_CL_64)
 		message("Building with CUDA not supported on 32 bit, skipped")
-		set(WITH_CYCLES_CUDA_BINARIES OFF)
+		set(WITH_CYCLES_CUDA_BINARIES OFF CACHE BOOL "" FORCE)
 	else()
 		set(SRC
 			cycles_cubin_cc.cpp



More information about the Bf-blender-cvs mailing list