Skip to content

Commit

Permalink
Add ext/openvdb for nanovdb
Browse files Browse the repository at this point in the history
  • Loading branch information
mmp committed Aug 25, 2020
1 parent 51e79b6 commit d5717cd
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@
[submodule "src/ext/filesystem"]
path = src/ext/filesystem
url = https://github.com/wjakob/filesystem.git
[submodule "src/ext/openvdb"]
path = src/ext/openvdb
url = https://github.com/AcademySoftwareFoundation/openvdb.git
branch = feature/nanovdb
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ check_ext ("Ptex" "ptex/src" 82bd326)
check_ext ("double-conversion" "double-conversion/cmake" 9a8e518)
check_ext ("filesystem" "filesystem/filesystem" 4efd2628)
check_ext ("stb" "stb/tools" 1034f5)
check_ext ("OpenVDB" "openvdb/nanovdb" d5ea9808f)
check_ext ("zlib" "zlib/doc" 54d591e)

if (CMAKE_BUILD_TYPE MATCHES Release)
Expand Down Expand Up @@ -165,6 +166,7 @@ if (CMAKE_CUDA_COMPILER)
# FIXME. Sigh. I'm not sure how else to pass this through to cuda_compile_ptx...
include_directories (src)
include_directories (${CMAKE_BINARY_DIR})
include_directories (${NANOVDB_INCLUDE})

# from Ingo's configure_optix.cmake (Apache licensed)
find_program (BIN2C bin2c DOC "Path to the CUDA SDK bin2c executable.")
Expand Down Expand Up @@ -656,6 +658,7 @@ target_include_directories (pbrt_lib PUBLIC
${FILESYSTEM_INCLUDE}
${PTEX_INCLUDE}
${DOUBLE_CONVERSION_INCLUDE}
${NANOVDB_INCLUDE}
${CMAKE_CURRENT_BINARY_DIR}
)

Expand Down
4 changes: 4 additions & 0 deletions src/ext/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,7 @@ set (DOUBLE_CONVERSION_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/double-conversion PAR

set_property (TARGET double-conversion cctest PROPERTY FOLDER "ext")

###########################################################################
# nanovdb

set (NANOVDB_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/openvdb/nanovdb PARENT_SCOPE)
1 change: 1 addition & 0 deletions src/ext/openvdb
Submodule openvdb added at 64adc5

0 comments on commit d5717cd

Please sign in to comment.