Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-09-15 14:03:17 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-09-15 14:03:17 +0400
commitb93da9b01e163158a830872d29f8bd874f63d54d (patch)
tree59730d1145eba4638a5128d0cc2c5fe3215007ab /intern/CMakeLists.txt
parent8add19d3ece8526f5334acec90fd4c1f1155218c (diff)
Color Management, Stage 1: Initial OpenColorIO library integration
This commit integrates support of OpenColorIO library into build systems. It also contains C-API for OpenColorIO library which could be used by Blender. CMake has got find rules familiar to OpenImageIO's one which makes it easier for build system to find needed libraries and includes. Scons only could use explicitly defined paths to libraries and includes. C-API would be compiled and Blender would be linked against C-API and OpenColorIO but it wouldn't affect on Blender behavior at all. OpenColorIO could be disabled by setting up WITH_OCIO to Off in CMake and setting WITH_BF_OCIO in Scons.
Diffstat (limited to 'intern/CMakeLists.txt')
-rw-r--r--intern/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt
index d520ffc87b4..2551df6ba76 100644
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -28,6 +28,7 @@ add_subdirectory(ghost)
add_subdirectory(guardedalloc)
add_subdirectory(moto)
add_subdirectory(memutil)
+add_subdirectory(opencolorio)
add_subdirectory(opennl)
add_subdirectory(mikktspace)
add_subdirectory(raskter)
@@ -73,3 +74,4 @@ endif()
if(WIN32)
add_subdirectory(utfconv)
endif()
+