diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-11 23:20:52 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-11 23:20:52 +0400 |
commit | 38fd8c0e227bc3475627f4698c6ebc37777ed4a9 (patch) | |
tree | 3ac8170edeb65c121cd2d0e771cd55c62451c403 | |
parent | e070823378dfb7e35a73a9fb5e76d9073ec82e25 (diff) |
Cycles: fix wrong openimageio path for lib/ directory.
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | 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' |