[Bf-blender-cvs] [63dc2e9] master: Futher tweaks to WITH_CPU_SSE option

Sergey Sharybin noreply at git.blender.org
Wed Oct 15 14:45:18 CEST 2014


Commit: 63dc2e9b7472b74631c6c8d3cf681fd54c47a902
Author: Sergey Sharybin
Date:   Wed Oct 15 18:43:47 2014 +0600
Branches: master
https://developer.blender.org/rB63dc2e9b7472b74631c6c8d3cf681fd54c47a902

Futher tweaks to WITH_CPU_SSE option

Explicitly disable SSE kernels in Cycles when this option is used.

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

M	intern/cycles/CMakeLists.txt

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

diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index fb747c1..7de1182 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -14,7 +14,9 @@ include(cmake/external_libs.cmake)
 # todo: refactor this code to match scons
 # note: CXX_HAS_SSE is needed in case passing SSE flags fails altogether (gcc-arm)
 
-if(WIN32 AND MSVC)
+if(NOT WITH_CPU_SSE)
+	set(CXX_HAS_SSE FALSE)
+elseif(WIN32 AND MSVC)
 	set(CXX_HAS_SSE TRUE)
 
 	# /arch:AVX for VC2012 and above




More information about the Bf-blender-cvs mailing list