Cycles: fix wrong openimageio path for lib/ directory.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 11 Nov 2011 19:20:52 +0000 (19:20 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 11 Nov 2011 19:20:52 +0000 (19:20 +0000)
CMakeLists.txt
build_files/scons/config/linux-config.py

index b8f7605875f577c724053dc75d860549b867ed0a..14ac05bf6c16dbebf3ae754539694cebb7379e0e 100644 (file)
@@ -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)
index 4921ab50595b99e22652dbfd5c52982a46ec0b50..7644259d3908939cc5a71c21e638d8999d566910 100644 (file)
@@ -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'