diff options
Diffstat (limited to 'build_files/build_environment/cmake/openvdb.cmake')
-rw-r--r-- | build_files/build_environment/cmake/openvdb.cmake | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/build_files/build_environment/cmake/openvdb.cmake b/build_files/build_environment/cmake/openvdb.cmake index f1b7c3d1b7d..2d0f62cc1a0 100644 --- a/build_files/build_environment/cmake/openvdb.cmake +++ b/build_files/build_environment/cmake/openvdb.cmake @@ -13,6 +13,7 @@ else() endif() set(OPENVDB_EXTRA_ARGS + ${DEFAULT_BOOST_FLAGS} -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING} -DBoost_USE_MULTITHREADED=ON -DBoost_USE_STATIC_LIBS=ON @@ -24,22 +25,20 @@ set(OPENVDB_EXTRA_ARGS -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/ -DBlosc_INCLUDE_DIR=${LIBDIR}/blosc/include/ -DBlosc_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT} - -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF - -DOPENVDB_BUILD_UNITTESTS=Off - -DOPENVDB_BUILD_PYTHON_MODULE=Off + -DBlosc_LIBRARY_RELEASE=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT} + -DBlosc_LIBRARY_DEBUG=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT} + -DOPENVDB_BUILD_UNITTESTS=OFF + -DOPENVDB_BUILD_PYTHON_MODULE=OFF + -DOPENVDB_BUILD_NANOVDB=ON + -DNANOVDB_BUILD_TOOLS=OFF -DBlosc_ROOT=${LIBDIR}/blosc/ -DTBB_ROOT=${LIBDIR}/tbb/ - -DOpenEXR_ROOT=${LIBDIR}/openexr - -DIlmBase_ROOT=${LIBDIR}/openexr - -DOPENEXR_LIBRARYDIR=${LIBDIR}/openexr/lib - # All libs live in openexr, even the ilmbase ones - -DILMBASE_LIBRARYDIR=${LIBDIR}/openexr/lib -DOPENVDB_CORE_SHARED=${OPENVDB_SHARED} -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC} - -DOPENVDB_BUILD_BINARIES=Off + -DOPENVDB_BUILD_BINARIES=OFF -DCMAKE_DEBUG_POSTFIX=_d - -DILMBASE_USE_STATIC_LIBS=On - -DOPENEXR_USE_STATIC_LIBS=On + -DBLOSC_USE_STATIC_LIBS=ON + -DUSE_NANOVDB=ON ) if(WIN32) @@ -48,15 +47,6 @@ if(WIN32) # needs to link pthreads due to it being a blosc dependency set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS} -DCMAKE_CXX_STANDARD_LIBRARIES="${LIBDIR}/pthreads/lib/pthreadVC3.lib" - -DUSE_EXR=On - ) -else() - # OpenVDB can't find the _static libraries automatically. - set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS} - -DTbb_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT} - -DTbb_tbb_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT} - -DTbb_tbbmalloc_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbbmalloc_static${LIBEXT} - -DTbb_tbbmalloc_proxy_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbbmalloc_proxy_static${LIBEXT} ) endif() @@ -74,7 +64,6 @@ add_dependencies( openvdb external_tbb external_boost - external_openexr external_zlib external_blosc ) @@ -82,7 +71,7 @@ add_dependencies( if(WIN32) if(BUILD_MODE STREQUAL Release) ExternalProject_Add_Step(openvdb after_install - COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include/openvdb ${HARVEST_TARGET}/openvdb/include/openvdb + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include ${HARVEST_TARGET}/openvdb/include COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb.dll ${HARVEST_TARGET}/openvdb/bin/openvdb.dll DEPENDEES install |