Skip to content

Commit 7e0fca6

Browse files
nachovizzonachovizzo
committed
Remove unnecessary boost system dependency
This library dependency was not being used anywhere, and therefore adding an additional dependency to the whole build system for no reason. Signed-off-by: Ignacio Vizzo <[email protected]>
1 parent db7f910 commit 7e0fca6

File tree

7 files changed

+20
-29
lines changed

7 files changed

+20
-29
lines changed

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ The following provides basic installation examples for the core OpenVDB library.
4040

4141
```bash
4242
apt-get install -y libboost-iostreams-dev
43-
apt-get install -y libboost-system-dev
4443
apt-get install -y libtbb-dev
4544
apt-get install -y libblosc-dev
4645
```
@@ -84,7 +83,6 @@ vcpkg install zlib:x64-windows
8483
vcpkg install blosc:x64-windows
8584
vcpkg install tbb:x64-windows
8685
vcpkg install boost-iostreams:x64-windows
87-
vcpkg install boost-system:x64-windows
8886
vcpkg install boost-any:x64-windows
8987
vcpkg install boost-algorithm:x64-windows
9088
vcpkg install boost-uuid:x64-windows

‎ci/install_windows.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ set -ex
44

55
vcpkg update
66
vcpkg install zlib libpng openexr tbb gtest blosc glfw3 glew \
7-
boost-iostreams boost-system boost-any boost-uuid boost-interprocess boost-algorithm
7+
boost-iostreams boost-any boost-uuid boost-interprocess boost-algorithm

‎cmake/FindOpenVDB.cmake‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS)
496496
set(Boost_USE_STATIC_LIBS OFF)
497497
endif()
498498

499-
find_package(Boost REQUIRED COMPONENTS iostreams system)
499+
find_package(Boost REQUIRED COMPONENTS iostreams)
500500

501501
# Add deps for pyopenvdb
502502
# @todo track for numpy
@@ -671,10 +671,7 @@ endif()
671671
# namespaced headers are correctly prioritized. Otherwise other include paths
672672
# from shared installs (including houdini) may pull in the wrong headers
673673

674-
set(_OPENVDB_VISIBLE_DEPENDENCIES
675-
Boost::iostreams
676-
Boost::system
677-
)
674+
set(_OPENVDB_VISIBLE_DEPENDENCIES Boost::iostreams)
678675

679676
if(OpenVDB_USES_IMATH_HALF)
680677
list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES $<TARGET_NAME_IF_EXISTS:IlmBase::Half> $<TARGET_NAME_IF_EXISTS:Imath::Imath>)

‎doc/build.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ Package | Description
259259
-------------- | --------------------------------------------------------------- | ------------------ |
260260
CMake | Cross-platform family of tools designed to help build software | All |
261261
C++14 Compiler | Matching Houdini compiler and version | All |
262-
Boost | Components: system, iostreams, python, thread | All |
262+
Boost | Components: iostreams, python, thread | All |
263263
GoogleTest | A unit testing framework module for C++ | Unit Tests |
264264
CppUnit | A unit testing framework module for C++ | Unit Tests (AX) |
265265
GLFW | Simple API for OpenGL development | OpenVDB View |
@@ -348,7 +348,7 @@ Package | Description
348348
-------------- | --------------------------------------------------------------- | -------------------------------- |
349349
CMake | Cross-platform family of tools designed to help build software | All |
350350
C++14 Compiler | Matching Houdini compiler and version | All |
351-
Boost | Components: system, iostreams, python, thread | All |
351+
Boost | Components: iostreams, python, thread | All |
352352
ZLIB | Compression library for disk serialization compression | All |
353353
Blosc | Recommended dependency for improved disk compression | All* |
354354
GoogleTest | A unit testing framework module for C++ | Unit Tests |

‎doc/dependencies.txt‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ Reference Platform, but for those that do, their specified versions are
3535

3636
@section depComponents OpenVDB Components
3737

38-
Component | Requirements | Optional
39-
----------------------- | ---------------------------------------------------------------- | --------
40-
OpenVDB Core Library | CMake, C++14 compiler, TBB::tbb, Boost::system, Boost::iostream | Blosc, ZLib, Log4cplus, IlmBase::Half
41-
OpenVDB Print | Core Library dependencies | -
42-
OpenVDB LOD | Core Library dependencies | -
43-
OpenVDB Render | Core Library dependencies | OpenEXR, IlmBase, libpng
44-
OpenVDB View | Core Library dependencies, OpenGL, GLFW3, GLEW* | -
45-
OpenVDB Python | Core Library dependencies, Python, Boost::python | Boost::numpy, NumPy
46-
OpenVDB AX | Core Library dependencies, LLVM | Bison, Flex
47-
NanoVDB | - | Core Library, CUDA, TBB, Blosc, ZLib
48-
OpenVDB UnitTests | Core Library dependencies, GoogleTest | CppUnit**
49-
OpenVDB Documentation | Doxygen | -
38+
Component | Requirements | Optional
39+
----------------------- | ------------------------------------------------- | --------
40+
OpenVDB Core Library | CMake, C++14 compiler, TBB::tbb, Boost::iostream | Blosc, ZLib, Log4cplus, IlmBase::Half
41+
OpenVDB Print | Core Library dependencies | -
42+
OpenVDB LOD | Core Library dependencies | -
43+
OpenVDB Render | Core Library dependencies | OpenEXR, IlmBase, libpng
44+
OpenVDB View | Core Library dependencies, OpenGL, GLFW3, GLEW* | -
45+
OpenVDB Python | Core Library dependencies, Python, Boost::python | Boost::numpy, NumPy
46+
OpenVDB AX | Core Library dependencies, LLVM | Bison, Flex
47+
NanoVDB | - | Core Library, CUDA, TBB, Blosc, ZLib
48+
OpenVDB UnitTests | Core Library dependencies, GoogleTest | CppUnit**
49+
OpenVDB Documentation | Doxygen | -
5050

5151
- @b * GLEW is only required for building the vdb_view binary on Windows.
5252
- @b ** CppUnit is only required for building the AX unit tests.
@@ -66,7 +66,7 @@ IlmBase | 2.2** | 2.3 | Used half precision floating points and
6666
OpenEXR | 2.2** | 2.3 | EXR serialization support | Y | Y | http://www.openexr.com
6767
TBB | 2018 | 2018 | 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.66 | 1.66 | Components: system, iostreams, python, numpy | Y | Y | https://www.boost.org
69+
Boost | 1.66 | 1.66 | Components: iostreams, python, numpy | Y | Y | https://www.boost.org
7070
LLVM | 6.0.0 | 8.0.0 | Target-independent code generation | Y | Y | https://llvm.org/
7171
Bison | 3.0.0 | 3.0.5 | General-purpose parser generator | Y | Y | https://www.gnu.org/software/gcc
7272
Flex | 2.6 | 2.6.4 | Fast lexical analyzer generator | Y | Y | https://github.com/westes/flex
@@ -135,7 +135,6 @@ methods or the [manual installation](@ref depManInstall) options.
135135
apt-get install cmake # CMake
136136
apt-get install libtbb-dev # TBB
137137
apt-get install zlibc # zlib
138-
apt-get install libboost-system-dev # Boost::system
139138
apt-get install libboost-iostreams-dev # Boost::iostream
140139
apt-get install libblosc-dev # Blosc
141140
# AX

‎openvdb/openvdb/CMakeLists.txt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ if(OPENVDB_CORE_SHARED AND NOT Boost_USE_STATIC_LIBS)
117117
set(Boost_USE_STATIC_LIBS OFF)
118118
endif()
119119

120-
find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS iostreams system)
120+
find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS iostreams)
121121
if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
122122
# The X.Y.Z boost version value isn't available until CMake 3.14
123123
set(FULL_BOOST_VERSION "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
@@ -250,9 +250,7 @@ endif()
250250
# if it's in a shared place (like /usr/local) it doesn't accidently pull in
251251
# other headers.
252252

253-
list(APPEND OPENVDB_CORE_DEPENDENT_LIBS
254-
Boost::iostreams
255-
Boost::system)
253+
list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Boost::iostreams)
256254

257255
if(WIN32)
258256
# Boost headers contain #pragma commands on Windows which causes Boost

‎openvdb/openvdb/unittest/TestStreamCompression.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include <boost/interprocess/mapped_region.hpp>
2020
#include <boost/iostreams/device/array.hpp>
2121
#include <boost/iostreams/stream.hpp>
22-
#include <boost/system/error_code.hpp>
2322
#include <boost/uuid/uuid_generators.hpp>
2423
#include <boost/uuid/uuid_io.hpp>
2524
#include <boost/version.hpp> // for BOOST_VERSION

0 commit comments

Comments
 (0)