CMake OpenVDB support on OS X
authorMartijn Berger <mberger@martijns-mbp.lan>
Sat, 6 Feb 2016 12:17:53 +0000 (04:17 -0800)
committerMartijn Berger <mberger@martijns-mbp.lan>
Sat, 6 Feb 2016 12:26:57 +0000 (04:26 -0800)
Reviewers: kevindietrich, sergey

Differential Revision: https://developer.blender.org/D1773

CMakeLists.txt

index 69e5359e23d8558526a85bccce5351c44d09b895..d2d87270fd0d4e556f1773d126f5dc763fdc0f6f 100644 (file)
@@ -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)