[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57579] trunk/blender/intern/cycles/ CMakeLists.txt: Fix for Debug build on MSVC2008 and MSVC2012 after Cycles Kernel optimization :
Juergen Herrmann
shadowrom at me.com
Wed Jun 19 19:17:52 CEST 2013
Revision: 57579
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57579
Author: shadowrom
Date: 2013-06-19 17:17:51 +0000 (Wed, 19 Jun 2013)
Log Message:
-----------
Fix for Debug build on MSVC2008 and MSVC2012 after Cycles Kernel optimization:
Compiler optimization was accidentally set to /Ox for debug build too.
Changed this to be /Od in Debug and /Ox in Release mode.
Modified Paths:
--------------
trunk/blender/intern/cycles/CMakeLists.txt
Modified: trunk/blender/intern/cycles/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/CMakeLists.txt 2013-06-19 17:10:16 UTC (rev 57578)
+++ trunk/blender/intern/cycles/CMakeLists.txt 2013-06-19 17:17:51 UTC (rev 57579)
@@ -13,10 +13,11 @@
endif()
if(WIN32 AND MSVC)
- set(CYCLES_SSE2_KERNEL_FLAGS "/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc /Ox /GS-")
+ set(CYCLES_SSE2_KERNEL_FLAGS "/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc /GS-")
# there is no /arch:SSE3, but intrinsics are available anyway
- set(CYCLES_SSE3_KERNEL_FLAGS "/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc /Ox /GS-")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /EHsc /Ox /GS-")
+ set(CYCLES_SSE3_KERNEL_FLAGS "/arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /fp:fast /EHsc /GS-")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast -D_CRT_SECURE_NO_WARNINGS /EHsc /GS-")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox")
elseif(CMAKE_COMPILER_IS_GNUCC)
set(CYCLES_SSE2_KERNEL_FLAGS "-ffast-math -msse -msse2 -mfpmath=sse")
set(CYCLES_SSE3_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -mssse3 -mfpmath=sse")
More information about the Bf-blender-cvs
mailing list