Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: fix wrong openimageio path for lib/ directory.

Browse Source
This commit is contained in:
Brecht Van Lommel
2011-11-11 19:20:52 +00:00
parent e070823378
commit 38fd8c0e22
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -545,7 +545,7 @@ if(UNIX AND NOT APPLE)
if(WITH_OPENIMAGEIO) if(WITH_OPENIMAGEIO)
# use lib dir if available and nothing else specified # use lib dir if available and nothing else specified
if(LIBDIR AND NOT OPENIMAGEIO_ROOT_DIR) if(LIBDIR AND NOT OPENIMAGEIO_ROOT_DIR)
set(OPENIMAGEIO_ROOT_DIR ${LIBDIR}/openimageio) set(OPENIMAGEIO_ROOT_DIR ${LIBDIR}/oiio)
endif() endif()
find_package(OpenImageIO) find_package(OpenImageIO)

4
build_files/scons/config/linux-config.py
View File

@@ -197,8 +197,8 @@ BF_JEMALLOC_LIB = 'jemalloc'
BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a' BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a'
WITH_BF_OIIO = True WITH_BF_OIIO = True
BF_OIIO = LIBDIR + '/openimageio' BF_OIIO = LIBDIR + '/oiio'
if not os.path.exists(LCGDIR + '/openimageio'): if not os.path.exists(LCGDIR + '/oiio'):
WITH_BF_OIIO = False WITH_BF_OIIO = False
BF_OIIO = '/usr' BF_OIIO = '/usr'
BF_OIIO_INC = BF_OIIO + '/include' BF_OIIO_INC = BF_OIIO + '/include'