cmake/openimageio - partially reverting #60692
authorDalai Felinto <dfelinto@gmail.com>
Sat, 12 Oct 2013 23:56:21 +0000 (23:56 +0000)
committerDalai Felinto <dfelinto@gmail.com>
Sat, 12 Oct 2013 23:56:21 +0000 (23:56 +0000)
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)

CMakeLists.txt
source/blender/CMakeLists.txt
source/blender/editors/space_file/CMakeLists.txt
source/blender/editors/space_image/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/intern/oiio/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/python/intern/CMakeLists.txt

index bf8304629aedbe3fbacb1e124c7f17820e2e19de..58ea825ae86805d81a3b372c76e0b248e6bbf3a9 100644 (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")
index dd0583ef01f827b38d22f83771f0f3abb895727c..0d309523daf2dfd35c0005d8e6fa7854f60a3c04 100644 (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()
 
index ce0b08c6708ba6c165882ea30259b4fbf74a5eb4..3b2db3ee7bc0860297953d64237e3f562f045463 100644 (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)
index 2f78818d01299e76d0a56bfeda027b9c9f202437..50d8051a73e1c453d3286256b4516e3197dddaea 100644 (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()
 
index 26cf19fc158dfd126cfd9ec090568aef2bc848e0..4025a41b6a7788b2ebbc7b82bad755e137661ed3 100644 (file)
@@ -106,7 +106,7 @@ if(WITH_IMAGE_TIFF)
 endif()
 
 
-if(WITH_IMAGE_OPENIMAGEIO)
+if(WITH_OPENIMAGEIO)
        add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 
index 271a2bc32687bb97e614ef41ed6992968c4ed163..5fb8f11602edb67b2ce80db82107b91fb44d9493 100644 (file)
@@ -44,7 +44,7 @@ set(SRC
        openimageio_api.cpp
 )
 
-if(WITH_IMAGE_OPENIMAGEIO)
+if(WITH_OPENIMAGEIO)
        list(APPEND INC_SYS
                ${OPENIMAGEIO_INCLUDE_DIRS}
        )
index bac335572f5ba36928d1da270926b45f2ef8df90..9b2fc2c3c4d5a0992b953510a6dae946f794968c 100644 (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)
index 4b2b86ab6c46466219e155b28025e3afa2fb51ea..ef5d26dccdcd36707dd73350f428328bb2765f4d 100644 (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()