[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60718] trunk/blender: cmake/ openimageio - partially reverting #60692

[Dalai Felinto]

Revision: 60718
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60718
Author:   dfelinto
Date:     2013-10-12 23:56:21 +0000 (Sat, 12 Oct 2013)
Log Message:
-----------
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)

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/blender/CMakeLists.txt
    trunk/blender/source/blender/editors/space_file/CMakeLists.txt
    trunk/blender/source/blender/editors/space_image/CMakeLists.txt
    trunk/blender/source/blender/imbuf/CMakeLists.txt
    trunk/blender/source/blender/imbuf/intern/oiio/CMakeLists.txt
    trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
    trunk/blender/source/blender/python/intern/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-10-12 22:31:02 UTC (rev 60717)
+++ trunk/blender/CMakeLists.txt	2013-10-12 23:56:21 UTC (rev 60718)
@@ -203,7 +203,7 @@
 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 @@
 	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")

Modified: trunk/blender/source/blender/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/CMakeLists.txt	2013-10-12 22:31:02 UTC (rev 60717)
+++ trunk/blender/source/blender/CMakeLists.txt	2013-10-12 23:56:21 UTC (rev 60718)
@@ -117,7 +117,7 @@
 	add_subdirectory(imbuf/intern/openexr)
 endif()
 
-if(WITH_IMAGE_OPENIMAGEIO)
+if(WITH_OPENIMAGEIO)
 	add_subdirectory(imbuf/intern/oiio)
 endif()
 

Modified: trunk/blender/source/blender/editors/space_file/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_file/CMakeLists.txt	2013-10-12 22:31:02 UTC (rev 60717)
+++ trunk/blender/source/blender/editors/space_file/CMakeLists.txt	2013-10-12 23:56:21 UTC (rev 60718)
@@ -58,8 +58,8 @@
 	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)

Modified: trunk/blender/source/blender/editors/space_image/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_image/CMakeLists.txt	2013-10-12 22:31:02 UTC (rev 60717)
+++ trunk/blender/source/blender/editors/space_image/CMakeLists.txt	2013-10-12 23:56:21 UTC (rev 60718)
@@ -50,7 +50,7 @@
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
-if(WITH_IMAGE_OPENIMAGEIO)
+if(WITH_OPENIMAGEIO)
 	add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 

Modified: trunk/blender/source/blender/imbuf/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/CMakeLists.txt	2013-10-12 22:31:02 UTC (rev 60717)
+++ trunk/blender/source/blender/imbuf/CMakeLists.txt	2013-10-12 23:56:21 UTC (rev 60718)
@@ -106,7 +106,7 @@
 endif()
 
 
-if(WITH_IMAGE_OPENIMAGEIO)
+if(WITH_OPENIMAGEIO)
 	add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 

Modified: trunk/blender/source/blender/imbuf/intern/oiio/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/intern/oiio/CMakeLists.txt	2013-10-12 22:31:02 UTC (rev 60717)
+++ trunk/blender/source/blender/imbuf/intern/oiio/CMakeLists.txt	2013-10-12 23:56:21 UTC (rev 60718)
@@ -44,7 +44,7 @@
 	openimageio_api.cpp
 )
 
-if(WITH_IMAGE_OPENIMAGEIO)
+if(WITH_OPENIMAGEIO)
 	list(APPEND INC_SYS
 		${OPENIMAGEIO_INCLUDE_DIRS}
 	)

Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt	2013-10-12 22:31:02 UTC (rev 60717)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt	2013-10-12 23:56:21 UTC (rev 60718)
@@ -166,8 +166,8 @@
 	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)

Modified: trunk/blender/source/blender/python/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/python/intern/CMakeLists.txt	2013-10-12 22:31:02 UTC (rev 60717)
+++ trunk/blender/source/blender/python/intern/CMakeLists.txt	2013-10-12 23:56:21 UTC (rev 60718)
@@ -174,7 +174,7 @@
 	add_definitions(-DWITH_OPENEXR)
 endif()
 
-if(WITH_IMAGE_OPENIMAGEIO)
+if(WITH_OPENIMAGEIO)
 	add_definitions(-DWITH_OPENIMAGEIO)
 endif()