mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index bfea2dd1a97..c59aff4c62c 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -252,6 +252,10 @@ option(WITH_OPENSUBDIV "Enable OpenSubdiv for surface subdivision" _init_OPEN
|
||
|
|
option(WITH_OPENVDB "Enable features relying on OpenVDB" OFF)
|
||
|
|
option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" OFF)
|
||
|
|
|
||
|
|
+if(WITH_OPENVDB)
|
||
|
|
+ add_definitions(-DOPENVDB_3_ABI_COMPATIBLE=TRUE)
|
||
|
|
+endif()
|
||
|
|
+
|
||
|
|
# GHOST Windowing Library Options
|
||
|
|
option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF)
|
||
|
|
mark_as_advanced(WITH_GHOST_DEBUG)
|
||
|
|
diff --git a/intern/openvdb/intern/openvdb_writer.cc b/intern/openvdb/intern/openvdb_writer.cc
|
||
|
|
index e886c5a76a8..bedcfe65552 100644
|
||
|
|
--- a/intern/openvdb/intern/openvdb_writer.cc
|
||
|
|
+++ b/intern/openvdb/intern/openvdb_writer.cc
|
||
|
|
@@ -45,7 +45,7 @@ void OpenVDBWriter::insert(const openvdb::GridBase::Ptr &grid)
|
||
|
|
|
||
|
|
void OpenVDBWriter::insert(const openvdb::GridBase &grid)
|
||
|
|
{
|
||
|
|
-#if (OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER == 3)
|
||
|
|
+#if (OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER <= 3) || defined(OPENVDB_3_ABI_COMPATIBLE)
|
||
|
|
m_grids->push_back(grid.copyGrid());
|
||
|
|
#else
|
||
|
|
m_grids->push_back(grid.copyGridWithNewTree());
|