Build: remove Cycles build options to disable RTTI
This was required for OSL, which used to be compiled entirely without RTTI for LLVM. However OSL now only compiles a private part of its code without RTTI, so this no longer necessary. Pull Request: https://projects.blender.org/blender/blender/pulls/116035
This commit is contained in:
committed by
Brecht Van Lommel
parent
aa40e9b3c1
commit
f9d69da432
@@ -191,13 +191,6 @@ if(CXX_HAS_AVX2)
|
||||
add_definitions(-DWITH_KERNEL_AVX2)
|
||||
endif()
|
||||
|
||||
# LLVM and OSL need to build without RTTI
|
||||
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()
|
||||
|
||||
# Definitions and Includes
|
||||
|
||||
add_definitions(
|
||||
|
||||
@@ -36,9 +36,6 @@ set(LIB
|
||||
${LLVM_LIBRARY}
|
||||
)
|
||||
|
||||
# OSL and LLVM are built without RTTI
|
||||
string(APPEND CMAKE_CXX_FLAGS " ${RTTI_DISABLE_FLAGS}")
|
||||
|
||||
if(APPLE)
|
||||
# Disable allocation warning on macOS prior to 10.14: the OSLRenderServices
|
||||
# contains member which is 64 bytes aligned (cache inside of OIIO's
|
||||
|
||||
@@ -108,8 +108,6 @@ if(WITH_CYCLES_OSL)
|
||||
list(APPEND LIB
|
||||
cycles_kernel_osl
|
||||
)
|
||||
|
||||
set_property(SOURCE osl.cpp PROPERTY COMPILE_FLAGS ${RTTI_DISABLE_FLAGS})
|
||||
endif()
|
||||
|
||||
if(WITH_OPENCOLORIO)
|
||||
|
||||
Reference in New Issue
Block a user