File tree Expand file tree Collapse file tree 3 files changed +0
-21
lines changed
Expand file tree Collapse file tree 3 files changed +0
-21
lines changed Original file line number Diff line number Diff line change @@ -491,16 +491,6 @@ endif()
491491# Add standard dependencies
492492
493493find_package (TBB REQUIRED COMPONENTS tbb)
494-
495- if (NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS)
496- # @note Both of these must be set for Boost 1.70 (VFX2020) to link against
497- # boost shared libraries (more specifically libraries built with -fPIC).
498- # http://boost.2283326.n4.nabble.com/CMake-config-scripts-broken-in-1-70-td4708957.html
499- # https://github.com/boostorg/boost_install/commit/160c7cb2b2c720e74463865ef0454d4c4cd9ae7c
500- set (BUILD_SHARED_LIBS ON )
501- set (Boost_USE_STATIC_LIBS OFF )
502- endif ()
503-
504494find_package (Boost REQUIRED COMPONENTS iostreams)
505495
506496# Add deps for pyopenvdb
Original file line number Diff line number Diff line change @@ -118,8 +118,6 @@ endif()
118118if (NANOVDB_USE_OPENVDB)
119119 if (NOT OPENVDB_BUILD_CORE AND NOT TARGET OpenVDB::openvdb)
120120 find_package (OpenVDB REQUIRED COMPONENTS openvdb)
121- # disable the shared libs that OpenVDB's cmake switches ON.
122- set (BUILD_SHARED_LIBS OFF )
123121 endif ()
124122endif ()
125123
Original file line number Diff line number Diff line change @@ -108,15 +108,6 @@ endif()
108108
109109# Collect and configure lib dependencies
110110
111- if (OPENVDB_CORE_SHARED AND NOT Boost_USE_STATIC_LIBS)
112- # @note Both of these must be set for Boost 1.70 (VFX2020) to link against
113- # boost shared libraries (more specifically libraries built with -fPIC).
114- # http://boost.2283326.n4.nabble.com/CMake-config-scripts-broken-in-1-70-td4708957.html
115- # https://github.com/boostorg/boost_install/commit/160c7cb2b2c720e74463865ef0454d4c4cd9ae7c
116- set (BUILD_SHARED_LIBS ON )
117- set (Boost_USE_STATIC_LIBS OFF )
118- endif ()
119-
120111if (OPENVDB_USE_DELAYED_LOADING)
121112 find_package (Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS iostreams)
122113else ()
You can’t perform that action at this time.
0 commit comments