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

Use only one find_package call for zlib. #5280

Merged
merged 16 commits into from
Feb 14, 2025
Merged

Use only one find_package call for zlib. #5280

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fc03971
Use only one find_package call for zlib.
byrnHDF Jan 27, 2025
f54d538
Default built zlib system libs is expected to be shared.
byrnHDF Jan 29, 2025
ff1897c
Merge branch 'HDFGroup:develop' into develop-zlib
byrnHDF Jan 29, 2025
b6af944
Remove debug code and exclude windows
byrnHDF Jan 29, 2025
7200ff1
Fix typos
byrnHDF Jan 29, 2025
17690f6
Change option to mean what it does
byrnHDF Jan 29, 2025
0c01767
Native zlib-ng is not found by the CMake module, use config
byrnHDF Jan 30, 2025
783ca6c
Add zlib system test job
byrnHDF Jan 31, 2025
d11ec20
Add verbose logging
byrnHDF Jan 31, 2025
7cccc2d
HDF5_ALLOW_EXTERNAL_SUPPORT forces builds
byrnHDF Jan 31, 2025
75ba3fb
Correct option setting
byrnHDF Jan 31, 2025
8cf4575
Merge branch 'HDFGroup:develop' into develop-zlib
byrnHDF Feb 10, 2025
e72e2a8
Correct description and release note
byrnHDF Feb 10, 2025
6b29279
Merge branch 'HDFGroup:develop' into develop-zlib
byrnHDF Feb 11, 2025
910ca72
Merge branch 'HDFGroup:develop' into develop-zlib
byrnHDF Feb 13, 2025
951df41
Address typo and grammer.
byrnHDF Feb 13, 2025
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
10 changes: 3 additions & 7 deletions CMakeFilters.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,13 @@ if (HDF5_ENABLE_ZLIB_SUPPORT)
set(ZLIB_FOUND FALSE)
if (HDF5_USE_ZLIB_STATIC)
set(ZLIB_SEARCH_TYPE static)
else ()
set(ZLIB_SEARCH_TYPE shared)
endif ()
# Search pure Config mode first
find_package (ZLIB NAMES ${PACKAGE_NAME} OPTIONAL_COMPONENTS ${ZLIB_SEARCH_TYPE})
if (NOT ZLIB_FOUND)
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
set(ZLIB_USE_STATIC_LIBS ${HDF5_USE_ZLIB_STATIC})
endif()
find_package (ZLIB) # Legacy find
else ()
set(ZLIB_SEARCH_TYPE shared)
endif ()
find_package (ZLIB NAMES ${PACKAGE_NAME} OPTIONAL_COMPONENTS ${ZLIB_SEARCH_TYPE})
set(H5_ZLIB_FOUND ${ZLIB_FOUND})
if (H5_ZLIB_FOUND)
if (HDF5_USE_ZLIB_NG)
Expand Down
Loading