diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-08-20 15:37:50 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-08-20 15:37:50 (GMT) |
| commit | 88ebaa5e4726643ad472d8fc8f731ede87b44b11 (patch) | |
| tree | 9dda1e6f8a1183e599934393a7f3d38ba1517bce /src/H5Zdeflate.c | |
| parent | d71fcfff2cfdc01c1dcf388cc080b7ca9e36bd68 (diff) | |
| download | hdf5-88ebaa5e4726643ad472d8fc8f731ede87b44b11.zip hdf5-88ebaa5e4726643ad472d8fc8f731ede87b44b11.tar.gz hdf5-88ebaa5e4726643ad472d8fc8f731ede87b44b11.tar.bz2 | |
[svn-r19260] Change Cmake to allow a local zlib header to be used in H5Zdelate module.
Corrected use of "SKIP" message in cmake.
Corrections to cmake configuration files (for cmake external projects).
Community suggested changes.
Tested: local linux
Diffstat (limited to 'src/H5Zdeflate.c')
| -rw-r--r-- | src/H5Zdeflate.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c index c490720..63e7b9a 100644 --- a/src/H5Zdeflate.c +++ b/src/H5Zdeflate.c @@ -28,8 +28,11 @@ #ifdef H5_HAVE_FILTER_DEFLATE -#ifdef H5_HAVE_ZLIB_H -# include "zlib.h" +#if defined(H5_HAVE_ZLIB_H) && !defined(H5_ZLIB_HEADER) +# define H5_ZLIB_HEADER "zlib.h" +#endif +#if defined(H5_ZLIB_HEADER) +# include H5_ZLIB_HEADER /* "zlib.h" */ #endif /* Local function prototypes */ |