[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52570] trunk/blender/intern/cycles/ CMakeLists.txt: -fno-rtti is a gcc option which gives a warning when using MSVC
Jason Wilkins
Jason.A.Wilkins at gmail.com
Mon Nov 26 14:48:48 CET 2012
Revision: 52570
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52570
Author: jwilkins
Date: 2012-11-26 13:48:48 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
-fno-rtti is a gcc option which gives a warning when using MSVC
Modified Paths:
--------------
trunk/blender/intern/cycles/CMakeLists.txt
Modified: trunk/blender/intern/cycles/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/CMakeLists.txt 2012-11-26 13:23:37 UTC (rev 52569)
+++ trunk/blender/intern/cycles/CMakeLists.txt 2012-11-26 13:48:48 UTC (rev 52570)
@@ -21,8 +21,11 @@
endif()
# for OSL
-set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
-# set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+if(WIN32 AND MSVC)
+ set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+elseif(CMAKE_COMPILER_IS_GNUCC)
+ set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+endif()
# Definitions and Includes
More information about the Bf-blender-cvs
mailing list