[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41760] trunk/blender: Cycles: fix wrong openimageio path for lib/ directory.

[Brecht Van Lommel]

Revision: 41760
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41760
Author:   blendix
Date:     2011-11-11 19:20:52 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
Cycles: fix wrong openimageio path for lib/ directory.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/build_files/scons/config/linux-config.py

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-11-11 16:01:13 UTC (rev 41759)
+++ trunk/blender/CMakeLists.txt	2011-11-11 19:20:52 UTC (rev 41760)
@@ -545,7 +545,7 @@
 	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)

Modified: trunk/blender/build_files/scons/config/linux-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linux-config.py	2011-11-11 16:01:13 UTC (rev 41759)
+++ trunk/blender/build_files/scons/config/linux-config.py	2011-11-11 19:20:52 UTC (rev 41760)
@@ -197,8 +197,8 @@
 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'