diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-10-04 17:39:08 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-10-04 17:39:08 +0400 |
commit | ef107d1a4d75ffc5645505867efec6b39b114d50 (patch) | |
tree | 618615b28006e4c8a6898d9f140ce37fc90bbb09 /intern/opencolorio/CMakeLists.txt | |
parent | d8144ef0f57bfba6973b7de34fe8238ab88707cc (diff) |
Color Management: fallback to stub ocio implementation in cases when
ocio configuration file failed to load
This solves issues with infinite NULL-checks to prevent crashes in
such situations. Currently only happens if there's no configuration
file at all, but could be tweaked further to fallback if this file
isn't usable by blender.
Diffstat (limited to 'intern/opencolorio/CMakeLists.txt')
-rw-r--r-- | intern/opencolorio/CMakeLists.txt | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/intern/opencolorio/CMakeLists.txt b/intern/opencolorio/CMakeLists.txt index 9f5d4cd332c..fb74d5e3f4e 100644 --- a/intern/opencolorio/CMakeLists.txt +++ b/intern/opencolorio/CMakeLists.txt @@ -26,41 +26,40 @@ set(INC . ../guardedalloc + ../../source/blender/blenlib ) set(INC_SYS ) +set(SRC + ocio_capi.cc + fallback_impl.cc + + ocio_capi.h + ocio_impl.h +) if(WITH_OPENCOLORIO) + add_definitions( + -DWITH_OCIO + ) list(APPEND INC_SYS ${OPENCOLORIO_INCLUDE_DIRS} ) + list(APPEND SRC + ocio_impl.cc + ) + if(WIN32 AND NOT MINGW) list(APPEND INC_SYS ${BOOST_INCLUDE_DIR} ) endif() - - set(SRC - ocio_capi.cpp - ocio_capi.h - ) -else() - list(APPEND INC - ../../source/blender/blenlib - ) - - set(SRC - ocio_capi_stub.cpp - ocio_capi.h - ) endif() -add_definitions( -) blender_add_lib(bf_intern_opencolorio "${SRC}" "${INC}" "${INC_SYS}") |