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

Jump to bottom

Fix setting of use_szlib #1867

Merged
merged 1 commit into from
Oct 15, 2020
Merged

Fix setting of use_szlib #1867

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: 1 addition & 1 deletion nc-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ else
has_hdf5="yes"
fi

has_szlib="@USE_SZLIB@"
has_szlib="@USE_SZIP@"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Umm are we really sure?

Yes sometimes it's szip and sometimes szlib. That's because HDF5 makes the same error of sometimes calling it one and sometimes the other. And it causes me a lot of problems!

But are you sure this is a correct replacement?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the only instance of USE_SZLIB in the entire NetCDF code base, so there was no way that it could be set unless I am overlooking something... It is also the symbol that is used for the has_szlib setting in libnetcdf.settings

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clarification -- it USE_SZIP is the symbol that is used to set the symbol that is used in libnetcdf.settings

if [ -z "$has_szlib" -o "$has_szlib" = "OFF" ]; then
has_szlib="no"
else
Expand Down