From 38fd8c0e227bc3475627f4698c6ebc37777ed4a9 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Fri, 11 Nov 2011 19:20:52 +0000
Subject: [PATCH] Cycles: fix wrong openimageio path for lib/ directory.

---
 CMakeLists.txt                           | 2 +-
 build_files/scons/config/linux-config.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8f7605875f..14ac05bf6c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -545,7 +545,7 @@ if(UNIX AND NOT APPLE)
 	if(WITH_OPENIMAGEIO)
 		# use lib dir if available and nothing else specified
 		if(LIBDIR AND NOT OPENIMAGEIO_ROOT_DIR)
-			set(OPENIMAGEIO_ROOT_DIR ${LIBDIR}/openimageio)
+			set(OPENIMAGEIO_ROOT_DIR ${LIBDIR}/oiio)
 		endif()
 
 		find_package(OpenImageIO)
diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py
index 4921ab50595..7644259d390 100644
--- a/build_files/scons/config/linux-config.py
+++ b/build_files/scons/config/linux-config.py
@@ -197,8 +197,8 @@ BF_JEMALLOC_LIB = 'jemalloc'
 BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a'
 
 WITH_BF_OIIO = True 
-BF_OIIO = LIBDIR + '/openimageio'
-if not os.path.exists(LCGDIR + '/openimageio'):
+BF_OIIO = LIBDIR + '/oiio'
+if not os.path.exists(LCGDIR + '/oiio'):
     WITH_BF_OIIO = False
     BF_OIIO = '/usr'
 BF_OIIO_INC = BF_OIIO + '/include'