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 /CMakeLists.txt | |
| 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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bf8304629ae..58ea825ae86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -203,7 +203,7 @@ option(WITH_MOD_REMESH "Enable Remesh Modifier" ON) option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF) # Image format support -option(WITH_IMAGE_OPENIMAGEIO "Enable OpenImageIO Support (http://www.openimageio.org)" OFF) +option(WITH_OPENIMAGEIO "Enable OpenImageIO Support (http://www.openimageio.org)" OFF) option(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON) option(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org)" ON) option(WITH_IMAGE_TIFF "Enable LibTIFF Support" ON) @@ -420,10 +420,6 @@ if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG)) message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG and WITH_CODEC_FFMPEG") endif() -if(WITH_IMAGE_OPENIMAGEIO) - set(WITH_OPENIMAGEIO ON) -endif() - # python module, needs some different options if(WITH_PYTHON_MODULE AND WITH_PLAYER) message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PLAYER to be OFF") |