diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-08 17:43:25 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-08 17:43:25 +0300 |
| commit | e8b6bcd65c946f5eb9623638eebcd93ed74d9358 (patch) | |
| tree | 2def0bada18cc84e8315dc20681d1928cf219fbb /build_files/build_environment/cmake/openvdb.cmake | |
| parent | cf8add42b807449e6f96f8ecab637d52e166052f (diff) | |
| parent | ddfd57c0d275e6222f9622379b4c716e868029ce (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/object/object_add.c
source/blender/python/intern/bpy_app_handlers.c
Diffstat (limited to 'build_files/build_environment/cmake/openvdb.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/openvdb.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/openvdb.cmake b/build_files/build_environment/cmake/openvdb.cmake index bf9ad9ca410..a71598c1a3b 100644 --- a/build_files/build_environment/cmake/openvdb.cmake +++ b/build_files/build_environment/cmake/openvdb.cmake @@ -36,6 +36,7 @@ set(OPENVDB_EXTRA_ARGS -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/ -DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT} -DTBB_ROOT_DIR=${LIBDIR}/tbb/ + -DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include -DTBB_LIBRARY=${LIBDIR}/tbb/lib/tbb_static${LIBEXT} -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING} -DBoost_USE_MULTITHREADED=ON |