diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-06-17 10:00:16 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-06-17 10:00:16 +0400 |
| commit | 985892c38cc6b9e46e2f43094911dad3f981d404 (patch) | |
| tree | ee7aad605c4ff7842105ff09fc2c4601afac30c3 /intern/cycles/CMakeLists.txt | |
| parent | f1fb5dad958e33603f7b930ab5e993dc8da680a6 (diff) | |
Cycles: only use -fno-rtti with OSL (conflicts with -fsanitize=vptr)
Diffstat (limited to 'intern/cycles/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 81421b6796a..efd5ec61525 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 |