Skip to content

Commit

Permalink
zlib 1.3.1, 2.21, HDF5 1.14.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
scivision committed Aug 1, 2024
1 parent 800421a commit e37ff8b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 21 deletions.
8 changes: 3 additions & 5 deletions cmake/libraries.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
{
"zlib1": {
"url": "https://zlib.net/zlib-1.3.tar.xz",
"sha256": "8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7"
"url": "https://zlib.net/zlib-1.3.1.tar.gz"
},
"zlib2": {
"url" : "https://github.com/zlib-ng/zlib-ng.git",
"tag": "2.1.6"
"url" : "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.2.1.tar.gz"
},
"hdf5": {
"url": "https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-1_14_3.tar.gz"
"url": "https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5_1.14.4.3.tar.gz"
}
}
17 changes: 1 addition & 16 deletions cmake/zlib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ include(ExternalProject)

if(zlib_legacy)
string(JSON zlib_url GET ${json} zlib1 url)
string(JSON zlib_sha256 GET ${json} zlib1 sha256)
else()
string(JSON zlib_url GET ${json} zlib2 url)
string(JSON zlib_tag GET ${json} zlib2 tag)
endif()

set(ZLIB_INCLUDE_DIRS ${CMAKE_INSTALL_FULL_INCLUDEDIR})
Expand Down Expand Up @@ -40,21 +38,8 @@ set(zlib_cmake_args
)
# NetCDF 4.9/4.6 needs fPIC

if(zlib_legacy)
set(zlib_download
URL ${zlib_url}
URL_HASH SHA256=${zlib_sha256}
)
else()
set(zlib_download
GIT_REPOSITORY ${zlib_url}
GIT_TAG ${zlib_tag}
GIT_SHALLOW true
)
endif()

ExternalProject_Add(ZLIB
${zlib_download}
URL ${zlib_url}
CMAKE_ARGS ${zlib_cmake_args}
BUILD_BYPRODUCTS ${ZLIB_LIBRARIES}
CONFIGURE_HANDLED_BY_BUILD ON
Expand Down

0 comments on commit e37ff8b

Please sign in to comment.