Commit: 985892c38cc6b9e46e2f43094911dad3f981d404
Author: Campbell Barton
Date: Tue Jun 17 16:00:16 2014 +1000
https://developer.blender.org/rB985892c38cc6b9e46e2f43094911dad3f981d404
Cycles: only use -fno-rtti with OSL (conflicts with -fsanitize=vptr)
===================================================================
M intern/cycles/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index 81421b6..efd5ec6 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -77,11 +77,12 @@ if(CXX_HAS_SSE)
)
endif()
-# for OSL
-if(WIN32 AND MSVC)
- set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
-elseif(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))
- set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+if(WITH_CYCLES_OSL)
+ if(WIN32 AND MSVC)
+ set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+ elseif(CMAKE_COMPILER_IS_GNUCC OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))
+ set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI
-DBOOST_NO_TYPEID")
+ endif()
endif()
# Definitions and Includes
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
