[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59683] trunk/blender/intern/cycles/ CMakeLists.txt: Cleanup:
Thomas Dinges
blender at dingto.org
Sat Aug 31 05:18:59 CEST 2013
Revision: 59683
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59683
Author: dingto
Date: 2013-08-31 03:18:55 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
Cleanup:
* Silence /arch:SSE2 warning on msvc x64.
Modified Paths:
--------------
trunk/blender/intern/cycles/CMakeLists.txt
Modified: trunk/blender/intern/cycles/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/CMakeLists.txt 2013-08-31 02:56:03 UTC (rev 59682)
+++ trunk/blender/intern/cycles/CMakeLists.txt 2013-08-31 03:18:55 UTC (rev 59683)
@@ -14,8 +14,13 @@
if(WIN32 AND MSVC)
# there is no /arch:SSE3, but intrinsics are available anyway
- set(CYCLES_SSE2_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
- set(CYCLES_SSE3_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+ if(CMAKE_CL_64)
+ set(CYCLES_SSE2_KERNEL_FLAGS "/fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+ set(CYCLES_SSE3_KERNEL_FLAGS "/fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+ else()
+ set(CYCLES_SSE2_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+ set(CYCLES_SSE3_KERNEL_FLAGS "/arch:SSE2 /fp:fast -D_CRT_SECURE_NO_WARNINGS /Gs-")
+ endif()
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")
More information about the Bf-blender-cvs
mailing list