Skip to content

Commit d77eaad

Browse files
authored
Merge pull request #1565 from Idclip/boost_fixes
Fixed a boost build issue when OPENVDB_USE_DELAYED_LOADING is set to OFF
2 parents f53592f + b1fdff9 commit d77eaad

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

doc/dependencies.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Reference Platform, but for those that do, their specified versions are
3737

3838
Component | Requirements | Optional
3939
----------------------- | ------------------------------------------------- | --------
40-
OpenVDB Core Library | CMake, C++17 compiler, TBB::tbb | Blosc, ZLib, Log4cplus, IlmBase::Half, Boost::iostream
40+
OpenVDB Core Library | CMake, C++17 compiler, TBB::tbb, Boost::headers | Blosc, ZLib, Log4cplus, IlmBase::Half, Boost::iostream
4141
OpenVDB Print | Core Library dependencies | -
4242
OpenVDB LOD | Core Library dependencies | -
4343
OpenVDB Render | Core Library dependencies | OpenEXR, IlmBase, libpng
@@ -66,7 +66,7 @@ IlmBase | 2.4 | 3.1 | Used half precision floating points and
6666
OpenEXR | 2.4 | 3.1 | EXR serialization support | Y | Y | http://www.openexr.com
6767
TBB | 2020.2 | 2020.3 | Threading Building Blocks - template library for task parallelism | Y | Y | https://www.threadingbuildingblocks.org
6868
ZLIB | 1.2.7 | Latest | Compression library for disk serialization compression | Y | Y | https://www.zlib.net
69-
Boost | 1.73 | 1.76 | Components: iostreams, python, numpy | Y | Y | https://www.boost.org
69+
Boost | 1.73 | 1.76 | Components: headers, iostreams, python, numpy | Y | Y | https://www.boost.org
7070
LLVM | 10.0.0 | 10.0.0* | Target-independent code generation | Y | Y | https://llvm.org/
7171
Bison | 3.0.0 | 3.7.0 | General-purpose parser generator | Y | Y | https://www.gnu.org/software/gcc
7272
Flex | 2.6.0 | 2.6.4 | Fast lexical analyzer generator | Y | Y | https://github.com/westes/flex

openvdb/openvdb/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ endif()
119119

120120
if(OPENVDB_USE_DELAYED_LOADING)
121121
find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS iostreams)
122+
else()
123+
find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS headers)
122124
endif()
123125

124126
if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
@@ -255,6 +257,8 @@ endif()
255257

256258
if(OPENVDB_USE_DELAYED_LOADING)
257259
list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Boost::iostreams)
260+
else()
261+
list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Boost::headers)
258262
endif()
259263

260264
if(WIN32)

pendingchanges/boost_build_fix.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Build:
2+
- Fixed a build issue where Boost was not being pulled in when
3+
OPENVDB_USE_DELAYED_LOADING was set to OFF.

0 commit comments

Comments
 (0)