Commit: 715410c2fd4188eb4c016eea87c2dcf6eb26a56a Author: Martijn Berger Date: Sat Feb 6 04:17:53 2016 -0800 Branches: master https://developer.blender.org/rB715410c2fd4188eb4c016eea87c2dcf6eb26a56a
CMake OpenVDB support on OS X Reviewers: kevindietrich, sergey Differential Revision: https://developer.blender.org/D1773 =================================================================== M CMakeLists.txt =================================================================== diff --git a/CMakeLists.txt b/CMakeLists.txt index 69e5359..d2d8727 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) _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
