diff options
| author | Patrick Mours <pmours@nvidia.com> | 2020-10-29 15:38:16 +0300 |
|---|---|---|
| committer | Patrick Mours <pmours@nvidia.com> | 2020-10-29 19:02:12 +0300 |
| commit | c26ad42ea43aa2160a765980087f3dd320db55f0 (patch) | |
| tree | 533ec95739aa26f3fda6bbce812da630eab8b92b /build_files/build_environment/cmake/openvdb.cmake | |
| parent | c1b30e0ed1767852c5bce6b2b132859675547cef (diff) | |
Simplify and enable NanoVDB dependency installation
Changes NanoVDB to be a standalone dependency that is independent of the OpenVDB one.
It works by downloading the "feature/nanovdb" branch of OpenVDB, but using the NanoVDB
CMake in the "nanovdb" subdirectory. Since it is header-only, only the install target is used.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D9383
Diffstat (limited to 'build_files/build_environment/cmake/openvdb.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/openvdb.cmake | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/build_files/build_environment/cmake/openvdb.cmake b/build_files/build_environment/cmake/openvdb.cmake index 07d0297d5aa..2962f085e1b 100644 --- a/build_files/build_environment/cmake/openvdb.cmake +++ b/build_files/build_environment/cmake/openvdb.cmake @@ -54,20 +54,6 @@ set(OPENVDB_EXTRA_ARGS -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC} -DOPENVDB_BUILD_BINARIES=Off -DCMAKE_DEBUG_POSTFIX=_d - # NanoVDB is header-only, so only need the install target - -DNANOVDB_BUILD_UNITTESTS=OFF - -DNANOVDB_BUILD_EXAMPLES=OFF - -DNANOVDB_BUILD_BENCHMARK=OFF - -DNANOVDB_BUILD_DOCS=OFF - -DNANOVDB_BUILD_TOOLS=OFF - -DNANOVDB_CUDA_KEEP_PTX=OFF - -DNANOVDB_USE_OPENGL=OFF - -DNANOVDB_USE_OPENGL=OFF - -DNANOVDB_USE_CUDA=OFF - -DNANOVDB_USE_TBB=OFF - -DNANOVDB_USE_OPTIX=OFF - -DNANOVDB_USE_OPENVDB=OFF - -DNANOVDB_ALLOW_FETCHCONTENT=OFF ) if(WIN32) @@ -88,18 +74,12 @@ else() ) endif() -if(WITH_NANOVDB) - set(OPENVDB_PATCH_FILE openvdb_nanovdb.diff) -else() - set(OPENVDB_PATCH_FILE openvdb.diff) -endif() - ExternalProject_Add(openvdb URL ${OPENVDB_URI} DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH MD5=${OPENVDB_HASH} PREFIX ${BUILD_DIR}/openvdb - PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/${OPENVDB_PATCH_FILE} + PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb.diff CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS} INSTALL_DIR ${LIBDIR}/openvdb ) @@ -121,12 +101,6 @@ if(WIN32) COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb.dll ${HARVEST_TARGET}/openvdb/bin/openvdb.dll DEPENDEES install ) - if(WITH_NANOVDB) - ExternalProject_Add_Step(openvdb nanovdb_install - COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/nanovdb ${HARVEST_TARGET}/nanovdb/include/nanovdb - DEPENDEES after_install - ) - endif() endif() if(BUILD_MODE STREQUAL Debug) ExternalProject_Add_Step(openvdb after_install |