diff options
| author | Martijn Berger <mberger@martijns-mbp.lan> | 2016-02-06 15:17:53 +0300 |
|---|---|---|
| committer | Martijn Berger <mberger@martijns-mbp.lan> | 2016-02-06 15:26:57 +0300 |
| commit | 715410c2fd4188eb4c016eea87c2dcf6eb26a56a (patch) | |
| tree | 7bfc2df9cebcb00ac6770926cd27cf7a800cf755 /CMakeLists.txt | |
| parent | dd185bf5b87a37f32af32fc5d1ef6e90748fdd64 (diff) | |
CMake OpenVDB support on OS X
Reviewers: kevindietrich, sergey
Differential Revision: https://developer.blender.org/D1773
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 69e5359e23d..d2d87270fd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2009,7 +2009,7 @@ elseif(APPLE) if(WITH_IMAGE_OPENEXR) set(OPENEXR ${LIBDIR}/openexr) set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include) - set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR) + set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR) set(OPENEXR_LIBRARIES Iex Half IlmImf Imath IlmThread) set(OPENEXR_LIBPATH ${OPENEXR}/lib) endif() @@ -2133,6 +2133,9 @@ elseif(APPLE) if(WITH_CYCLES_NETWORK) list(APPEND BOOST_LIBRARIES boost_serialization-mt) endif() + if(WITH_OPENVDB) + list(APPEND BOOST_LIBRARIES boost_iostreams-mt) + endif() set(BOOST_LIBPATH ${BOOST}/lib) set(BOOST_DEFINITIONS) endif() @@ -2160,6 +2163,8 @@ elseif(APPLE) if(WITH_OPENVDB) set(OPENVDB ${LIBDIR}/openvdb) set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include) + set(TBB_INCLUDE_DIRS ${LIBDIR}/tbb/include) + set(TBB_LIBRARIES ${LIBDIR}/tbb/lib/libtbb.a) set(OPENVDB_LIBRARIES openvdb ${TBB_LIBRARIES}) set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib) set(OPENVDB_DEFINITIONS) |