[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55631] trunk/blender/CMakeLists.txt: CMake fix: OpenEXR and Tiff are linking dependencies of OIIO, and fix for Boost-Cycles-OIIO order

[Dalai Felinto]

Revision: 55631
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55631
Author:   dfelinto
Date:     2013-03-27 18:44:46 +0000 (Wed, 27 Mar 2013)
Log Message:
-----------
CMake fix: OpenEXR and Tiff are linking dependencies of OIIO, and fix for Boost-Cycles-OIIO order

The NOT BOOST test was changing Cycles so should be before the
cycles-oiio link (by Campbell Barton, thanks)

And exr and tiff are required for oiio (on OSX at least)

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-03-27 18:31:18 UTC (rev 55630)
+++ trunk/blender/CMakeLists.txt	2013-03-27 18:44:46 UTC (rev 55631)
@@ -408,11 +408,6 @@
 	set(WITH_HEADLESS ON)
 endif()
 
-# auto enable openimageio for cycles
-if(WITH_CYCLES)
-	set(WITH_OPENIMAGEIO ON)
-endif()
-
 # enable boost for cycles, booleans, audaspace or i18n
 # otherwise if the user disabled
 if(NOT WITH_BOOST)
@@ -431,6 +426,17 @@
 	set(WITH_BOOST OFF)
 endif()
 
+# auto enable openimageio for cycles
+if(WITH_CYCLES)
+	set(WITH_OPENIMAGEIO ON)
+endif()
+
+# auto enable openimageio linking dependencies
+if(WITH_OPENIMAGEIO)
+	set(WITH_IMAGE_OPENEXR ON)
+	set(WITH_IMAGE_TIFF ON)
+endif()
+
 # auto enable llvm for cycles_osl
 if(WITH_CYCLES_OSL)
 	set(WITH_LLVM ON CACHE BOOL "ON" FORCE)