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/harvest.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/harvest.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index 1fb56c4d568..1c5354aeb42 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -146,10 +146,8 @@ harvest(openjpeg/lib openjpeg/lib "*.a") harvest(opensubdiv/include opensubdiv/include "*.h") harvest(opensubdiv/lib opensubdiv/lib "*.a") harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h") -if(WITH_NANOVDB) - harvest(openvdb/nanovdb nanovdb/include/nanovdb "*.h") -endif() harvest(openvdb/lib openvdb/lib "*.a") +harvest(nanovdb/nanovdb nanovdb/include/nanovdb "*.h") harvest(xr_openxr_sdk/include/openxr xr_openxr_sdk/include/openxr "*.h") harvest(xr_openxr_sdk/lib xr_openxr_sdk/lib "*.a") harvest(osl/bin osl/bin "oslc") |