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 | |
| 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')
| -rw-r--r-- | source/blender/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_file/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_image/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/oiio/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index dd0583ef01f..0d309523daf 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -117,7 +117,7 @@ if(WITH_IMAGE_OPENEXR) add_subdirectory(imbuf/intern/openexr) endif() -if(WITH_IMAGE_OPENIMAGEIO) +if(WITH_OPENIMAGEIO) add_subdirectory(imbuf/intern/oiio) endif() 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() diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 26cf19fc158..4025a41b6a7 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -106,7 +106,7 @@ if(WITH_IMAGE_TIFF) endif() -if(WITH_IMAGE_OPENIMAGEIO) +if(WITH_OPENIMAGEIO) add_definitions(-DWITH_OPENIMAGEIO) endif() diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt index 271a2bc3268..5fb8f11602e 100644 --- a/source/blender/imbuf/intern/oiio/CMakeLists.txt +++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt @@ -44,7 +44,7 @@ set(SRC openimageio_api.cpp ) -if(WITH_IMAGE_OPENIMAGEIO) +if(WITH_OPENIMAGEIO) list(APPEND INC_SYS ${OPENIMAGEIO_INCLUDE_DIRS} ) diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index bac335572f5..9b2fc2c3c4d 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -166,8 +166,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/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 4b2b86ab6c4..ef5d26dccdc 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -174,7 +174,7 @@ if(WITH_IMAGE_OPENEXR) add_definitions(-DWITH_OPENEXR) endif() -if(WITH_IMAGE_OPENIMAGEIO) +if(WITH_OPENIMAGEIO) add_definitions(-DWITH_OPENIMAGEIO) endif() |