Revision: 58927
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58927
Author: blendix
Date: 2013-08-05 12:02:43 +0000 (Mon, 05 Aug 2013)
Log Message:
-----------
Fix wrong cycles cmake + msvc build flags with relwithdebinfo and minsizerel.
Patch by Karsten Schwenk.
Modified Paths:
--------------
trunk/blender/intern/cycles/CMakeLists.txt
Modified: trunk/blender/intern/cycles/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/CMakeLists.txt 2013-08-05 06:08:58 UTC (rev
58926)
+++ trunk/blender/intern/cycles/CMakeLists.txt 2013-08-05 12:02:43 UTC (rev
58927)
@@ -19,8 +19,8 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast
-D_CRT_SECURE_NO_WARNINGS /Gs-")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Ox")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} /Ox")
- set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_RELEASE} /Ox")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
/Ox")
+ set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /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")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs