tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

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)
This commit is contained in:
Dalai Felinto 2013-10-12 23:56:21 +00:00
parent 2ce3bd0d67
commit 7c2fae19b4
8 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -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")

2
source/blender/CMakeLists.txt
View File

@ -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()

4
source/blender/editors/space_file/CMakeLists.txt
View File

@ -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)

2
source/blender/editors/space_image/CMakeLists.txt
View File

@ -50,7 +50,7 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
if(WITH_IMAGE_OPENIMAGEIO)
if(WITH_OPENIMAGEIO)
add_definitions(-DWITH_OPENIMAGEIO)
endif()

2
source/blender/imbuf/CMakeLists.txt
View File

@ -106,7 +106,7 @@ if(WITH_IMAGE_TIFF)
endif()
if(WITH_IMAGE_OPENIMAGEIO)
if(WITH_OPENIMAGEIO)
add_definitions(-DWITH_OPENIMAGEIO)
endif()

2
source/blender/imbuf/intern/oiio/CMakeLists.txt
View File

@ -44,7 +44,7 @@ set(SRC
openimageio_api.cpp
)
if(WITH_IMAGE_OPENIMAGEIO)
if(WITH_OPENIMAGEIO)
list(APPEND INC_SYS
${OPENIMAGEIO_INCLUDE_DIRS}
)

4
source/blender/makesrna/intern/CMakeLists.txt
View File

@ -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)

2
source/blender/python/intern/CMakeLists.txt
View File

@ -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()