Skip to content

Commit bf68eec

Browse files
hadesslanewei120
authored andcommitted
ENH: Allow using system Blosc
To make it easier to test newer versions, or apply system specific patches.
1 parent 1215df6 commit bf68eec

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

deps/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ option(DEP_BUILD_TIFF "Compile libtiff" ON)
4040
option(DEP_BUILD_BOOST "Compile boost" ON)
4141
option(DEP_BUILD_OPENSSL "Compile openssl" ON)
4242
option(DEP_BUILD_GLFW "Compile GLFW" ON)
43+
option(DEP_BUILD_BLOSC "Compile Blosc" ON)
4344
option(DEP_BUILD_FREETYPE "Compile freetype" ON)
4445
option(DEP_BUILD_WXWIDGETS "Compile wxWidgets" ON)
4546
option(DEP_BUILD_FFMPEG "Compile ffmpeg" ON)
@@ -241,7 +242,11 @@ include(OpenCSG/OpenCSG.cmake)
241242

242243
include(TBB/TBB.cmake)
243244

244-
include(Blosc/Blosc.cmake)
245+
set(BLOSC_PKG "")
246+
if (DEP_BUILD_BLOSC)
247+
include(Blosc/Blosc.cmake)
248+
set(BLOSC_PKG dep_Blosc)
249+
endif ()
245250
include(OpenEXR/OpenEXR.cmake)
246251
include(OpenVDB/OpenVDB.cmake)
247252

deps/OpenVDB/OpenVDB.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ bambustudio_add_cmake_project(OpenVDB
2222
PATCH_COMMAND git apply ${OPENVDB_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-clang19.patch
2323
# URL https://github.com/AcademySoftwareFoundation/openvdb/archive/refs/tags/v10.0.1.zip
2424
# URL_HASH SHA256=48C2CFA9853B58FA86282DF1F83F0E99D07858CC03EB2BA8227DC447A830100A
25-
DEPENDS dep_TBB dep_Blosc dep_OpenEXR ${BOOST_PKG}
25+
DEPENDS dep_TBB ${BLOSC_PKG} dep_OpenEXR ${BOOST_PKG}
2626
CMAKE_ARGS
2727
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
2828
-DOPENVDB_BUILD_PYTHON_MODULE=OFF

0 commit comments

Comments
 (0)