Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing blosc2 info #4717

Merged
merged 1 commit into from
Aug 16, 2024
Merged

Add missing blosc2 info #4717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
"BLOSC_ZLIB_PACKAGE_NAME": {"type": "STRING", "value": "zlib"},
"BLOSC2_TGZ_NAME": {"type": "STRING", "value": "c-blosc2-2.14.4.tar.gz"},
"BLOSC2_PACKAGE_NAME": {"type": "STRING", "value": "blosc2"},
"BLOSC2_ZLIB_TGZ_NAME": {"type": "STRING", "value": "zlib-1.3.tar.gz"},
"BLOSC2_ZLIB_PACKAGE_NAME": {"type": "STRING", "value": "zlib"},
"BZ2_TGZ_NAME": {"type": "STRING", "value": "bzip2-bzip2-1.0.8.tar.gz"},
"BZ2_PACKAGE_NAME": {"type": "STRING", "value": "bz2"},
"FPZIP_TGZ_NAME": {"type": "STRING", "value": "fpzip-1.3.0.tar.gz"},
Expand Down
8 changes: 8 additions & 0 deletions config/cmake/cacheinit.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,14 @@ set (BLOSC2_TGZ_NAME "c-blosc2-2.14.4.tar.gz" CACHE STRING "Use BLOSC2 from comp

set (BLOSC2_PACKAGE_NAME "blosc2" CACHE STRING "Name of BLOSC2 package" FORCE)

set (BLOSC2_ZLIB_GIT_URL "https://github.com/madler/zlib.git" CACHE STRING "Use ZLIB from GitHub repository" FORCE)
set (BLOSC2_ZLIB_GIT_BRANCH "develop" CACHE STRING "" FORCE)

set (BLOSC2_ZLIB_TGZ_ORIGPATH "https://github.com/madler/zlib/releases/download/v1.3" CACHE STRING "Use PLUGINS from original location" FORCE)
set (BLOSC2_ZLIB_TGZ_NAME "zlib-1.3.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)

set (BLOSC2_ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of BLOSC2_ZLIB package" FORCE)

########
# bzip2
########
Expand Down
20 changes: 14 additions & 6 deletions release_docs/INSTALL_CMake.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ To build HDF5 with the SZIP and ZLIB external libraries you will need to:
------bin
------include
------lib
--------plugins
------cmake

On Linux, change to the install destination directory
Expand All @@ -162,6 +163,7 @@ To build HDF5 with the SZIP and ZLIB external libraries you will need to:
------bin
------include
------lib
--------plugins
------share

On Mac you will find HDF5-1.15."X"-Darwin.dmg in the myhdfstuff folder. Click
Expand All @@ -173,6 +175,7 @@ To build HDF5 with the SZIP and ZLIB external libraries you will need to:
------bin
------include
------lib
--------plugins
------share

By default the installation will create the bin, include, lib and cmake
Expand Down Expand Up @@ -239,6 +242,7 @@ Notes: This short set of instructions is written for users who want to
------bin
------include
------lib
--------plugins
------cmake

On Linux, change to the install destination directory
Expand All @@ -257,6 +261,7 @@ Notes: This short set of instructions is written for users who want to
------bin
------include
------lib
--------plugins
------share

On Mac you will find HDF5-1.15."X"-Darwin.dmg in the build folder. Click
Expand All @@ -268,6 +273,7 @@ Notes: This short set of instructions is written for users who want to
------bin
------include
------lib
--------plugins
------share


Expand Down Expand Up @@ -411,10 +417,8 @@ IV. Further considerations
Notes: CMake and HDF5

1. Using CMake for building and using HDF5 is under active development.
While we have attempted to provide error-free files, please
understand that development with CMake has not been extensively
tested outside of HDF. The CMake specific files may change
before the next release.
We have attempted to provide error-free files. The CMake specific
files may change before the next release.

2. CMake support for HDF5 development should be usable on any
system where CMake is supported. Please send us any comments on
Expand Down Expand Up @@ -587,6 +591,11 @@ These five steps are described in detail below.
set (BLOSC2_TGZ_ORIGPATH "https://github.com/Blosc/c-blosc2/archive/refs/tags" CACHE STRING "Use PLUGINS from original location" FORCE)
set (BLOSC2_TGZ_NAME "c-blosc2-2.14.4.tar.gz" CACHE STRING "Use BLOSC2 from compressed file" FORCE)
set (BLOSC2_PACKAGE_NAME "blosc2" CACHE STRING "Name of BLOSC2 package" FORCE)
set (BLOSC2_ZLIB_GIT_URL "https://github.com/madler/zlib.git" CACHE STRING "Use ZLIB from GitHub repository" FORCE)
set (BLOSC2_ZLIB_GIT_BRANCH "develop" CACHE STRING "" FORCE)
set (BLOSC2_ZLIB_TGZ_ORIGPATH "https://github.com/madler/zlib/releases/download/v1.3" CACHE STRING "Use PLUGINS from original location" FORCE)
set (BLOSC2_ZLIB_TGZ_NAME "zlib-1.3.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)
set (BLOSC2_ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of BLOSC2_ZLIB package" FORCE)
########
# bzip2
########
Expand Down Expand Up @@ -663,7 +672,7 @@ These five steps are described in detail below.

2.1 Visual CMake users, click the Configure button. If this is the first time you are
running cmake-gui in this directory, you will be prompted for the
generator you wish to use (for example on Windows, Visual Studio 12).
generator you wish to use (for example on Windows, Visual Studio 14).
CMake will read in the CMakeLists.txt files from the source directory and
display options for the HDF5 project. After the first configure you
can adjust the cache settings and/or specify the locations of other programs.
Expand Down Expand Up @@ -1124,7 +1133,6 @@ Using individual command presets (where <compiler-type> is GNUC or MSVC or Clan
ctest --preset ci-StdShar-<compiler-type>
cpack --preset ci-StdShar-<compiler-type>


Using the workflow preset to configure, build, test and package the standard configuration:
change directory to the hdf5 source folder
execute "cmake --workflow --preset ci-StdShar-<compiler-type> --fresh"
Expand Down
Loading