diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2013-10-13 03:56:21 +0400 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2013-10-13 03:56:21 +0400 |
commit | 7c2fae19b4cf6357def1d2bbe3a75696fd61bc86 (patch) | |
tree | 967b77e2461be9512fc5b662fd5d258d4159b1aa /source/blender/editors | |
parent | 2ce3bd0d672e7e26e1a8710444872ad6478a7565 (diff) |
cmake/openimageio - partially reverting #60692
We now have openimageio building when cycles builds or when it's
manually set to build.
(I reverted the _IMAGE_ in the define name because I think the closer
the cmake flags match the defines in the software the better, and there
is no reason to rename all the existent WITH_OPENIMAGEIO references in
CMakeLists.txt - which would be the alternative)
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_file/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/space_image/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index ce0b08c6708..3b2db3ee7bc 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -58,8 +58,8 @@ if(WITH_IMAGE_OPENEXR) add_definitions(-DWITH_OPENEXR) endif() -if(WITH_IMAGE_OPENIMAGEIO) - add_definitions(-DWITH_OPENIMAGEIO) +if(WITH_OPENIMAGEIO) + add_definitions(-DWITH_OPENIMAGEIO) endif() if(WITH_IMAGE_TIFF) diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 2f78818d012..50d8051a73e 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -50,7 +50,7 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() -if(WITH_IMAGE_OPENIMAGEIO) +if(WITH_OPENIMAGEIO) add_definitions(-DWITH_OPENIMAGEIO) endif() |