diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2010-08-20 15:16:06 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2010-08-20 15:16:06 (GMT) |
commit | 456ebba0fbeff3951764acab396ba161297e99ef (patch) | |
tree | ddcc9fc08770d657dd15b84cd90fcf6a2e4a7a3a /src/H5Zdeflate.c | |
parent | 7c31e7873c4e91fdb25b921d0220e9961ef0af7f (diff) | |
download | hdf5-456ebba0fbeff3951764acab396ba161297e99ef.zip hdf5-456ebba0fbeff3951764acab396ba161297e99ef.tar.gz hdf5-456ebba0fbeff3951764acab396ba161297e99ef.tar.bz2 |
[svn-r19257] 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 */ |