[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40329] branches/cycles/CMakeLists.txt: Cycles: fix openimageio build issues on mac/linux.

[Brecht Van Lommel]

Revision: 40329
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40329
Author:   blendix
Date:     2011-09-18 15:00:39 +0000 (Sun, 18 Sep 2011)
Log Message:
-----------
Cycles: fix openimageio build issues on mac/linux.

Modified Paths:
--------------
    branches/cycles/CMakeLists.txt

Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt	2011-09-18 14:54:41 UTC (rev 40328)
+++ branches/cycles/CMakeLists.txt	2011-09-18 15:00:39 UTC (rev 40329)
@@ -525,10 +525,11 @@
 
 		# temp, update
 		if(CYCLES_OIIO)
-			set(OPENIMAGEIO_ROOT_DIR ${CYCLES_OIIO})
+			set(OPENIMAGEIO ${CYCLES_OIIO})
 			unset(CYCLES_OIIO CACHE)
 		endif()
 
+		set(OPENIMAGEIO_ROOT_DIR ${OPENIMAGEIO})
 		find_package(OpenImageIO)
 
 		set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
@@ -849,10 +850,10 @@
 		endif()
 			
 		if(WITH_OPENIMAGEIO)
-			set(OPENIMAGEIO_ROOT_DIR ${LIBDIR}/openimageio)
-			set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_ROOT_DIR}/include)
+			set(OPENIMAGEIO ${LIBDIR}/openimageio)
+			set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
 			set(OPENIMAGEIO_LIBRARIES OpenImageIO)
-			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO_ROOT_DIR}/lib)
+			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
 			set(OPENIMAGEIO_DEFINITIONS)
 		endif()
 
@@ -984,10 +985,10 @@
 		endif()
 			
 		if(WITH_OPENIMAGEIO)
-			set(OPENIMAGEIO_ROOT_DIR ${LIBDIR}/openimageio)
-			set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_ROOT_DIR}/include)
+			set(OPENIMAGEIO ${LIBDIR}/openimageio)
+			set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
 			set(OPENIMAGEIO_LIBRARIES OpenImageIO)
-			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO_ROOT_DIR}/lib)
+			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
 			set(OPENIMAGEIO_DEFINITIONS)
 		endif()
 
@@ -1211,9 +1212,9 @@
 
 	if(WITH_OPENIMAGEIO)
 		set(OPENIMAGEIO ${LIBDIR}/openimageio)
-		set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_ROOT_DIR}/include)
+		set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
 		set(OPENIMAGEIO_LIBRARIES OpenImageIO ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES})
-		set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO_ROOT_DIR}/lib ${JPEG_LIBPATH} ${PNG_LIBPATH} ${TIFF_LIBPATH} ${OPENEXR_LIBPATH} ${ZLIB_LIBPATH})
+		set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib ${JPEG_LIBPATH} ${PNG_LIBPATH} ${TIFF_LIBPATH} ${OPENEXR_LIBPATH} ${ZLIB_LIBPATH})
 		set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
 	endif()